lp://staging/~jamesodhunt/libnih/fix-for-777097

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://staging/libnih/1.0

Scott James Remnant: Pending requested 2011-06-20

Diff: 121 lines (+87/-9)

2 files modified

nih/tests/test_watch.c (+72/-3)
nih/watch.c (+15/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #777097: nih_watch_handle() does not handle file watches correctly

Undecided

Fix Committed

Link a bug report

Related blueprints

1049. By James Hunt on 2011-06-20

* nih/watch.c:nih_watch_handle(): Handle non-directory watches;
  previously a file watch resulted in an invalid file path ending in
  a single slash (LP:#777097).
* nih/tests/test_watch.c: Added explicit test for watch on a file.

1048. By Scott James Remnant (Canonical) on 2011-01-14

Typo fixes from James

1047. By Scott James Remnant (Canonical) on 2010-12-23

* configure.ac: Bump version to 1.0.4
* NEWS: Begin new release

1046. By Scott James Remnant (Canonical) on 2010-12-23

* NEWS: Release 1.0.3

1045. By Scott James Remnant (Canonical) on 2010-12-23

* nih-dbus-tool/type.c (type_const, type_of): Add support for the
DBUS_TYPE_UNIX_FD type, with a C type of "int".
* nih-dbus-tool/tests/test_type.c (test_const, test_of): Check the types
are correct.
* nih-dbus-tool/tests/marshal_factory.c: Generate function for
unix_fd testing
* nih-dbus-tool/tests/marshal_code.h: Add header for generated function
* nih-dbus-tool/tests/test_marshal.c (test_marshal): Test the generator
and the generated function
* nih-dbus-tool/tests/demarshal_factory.c: Generate function for
unix_fd testing
* nih-dbus-tool/tests/demarshal_code.h: Add header for generated function
* nih-dbus-tool/tests/test_demarshal.c (test_demarshal): Test the
generator and the generated code
* nih-dbus-tool/tests/com.netsplit.Nih.Test.xml: Add methods, signal and
properties for testing.
* nih-dbus-tool/tests/com.netsplit.Nih.Test_impl.h: Add property
definition
* nih-dbus-tool/tests/com.netsplit.Nih.Test_impl.c (my_test_unix_fd_to_str)
(my_test_str_to_unix_fd, my_test_get_unix_fd)
(my_test_set_unix_fd): Test implementation.
* nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c (test_unix_fd_to_str)
(test_str_to_unix_fd, test_new_unix_fd, test_get_unix_fd)
(test_set_unix_fd): Add methods to test the object implementation.
* nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c (test_unix_fd_to_str)
(test_unix_fd_to_str_sync, test_str_to_unix_fd)
(test_str_to_unix_fd_sync, test_new_unix_fd, test_get_unix_fd)
(test_get_unix_fd_sync, test_set_unix_fd, test_set_unix_fd_sync): Add tests
for unix fds.
(test_get_all, test_get_all_sync): Add unix fd to tests.
* NEWS: Update

1044. By Scott James Remnant (Canonical) on 2010-04-27

* configure.ac: Bump version to 1.0.3
* NEWS: Begin new release

1043. By Scott James Remnant (Canonical) on 2010-04-27

* NEWS: Release 1.0.2

1042. By Scott James Remnant (Canonical) on 2010-04-25

* m4/libnih.m4 (NIH_WITH_LOCAL_LIBNIH): Add macro cribbed from the
Upstart configure.ac

1041. By Scott James Remnant (Canonical) on 2010-03-04

* nih-dbus-tool/Makefile.am (tests/marshal_code.c)
(tests/demarshal_code.c, tests/interface_code.c)
(tests/method_code.c, tests/signal_code.c)
(tests/property_code.c): Support silent rules by using $(AM_V_GEN)

1040. By Scott James Remnant (Canonical) on 2010-03-04

Update NEWS