Changeset da4f72c38ed31111d447c64efd78cf500beabf73

Timestamp:

06/07/08 00:13:03 (7 months ago)

Author:

Sebastien Martini <ookoi@…>

Parents:

c36bdd432b56f0d9a329c918c0a3a0110d59f5c4

Children:

6253a716008486c1864f4416916bb2fe1387498c

git-committer:

Sebastien Martini <ookoi@mars.(none)> / 2008-06-07T00:13:03Z+0200

Message:

* Fix segmentation fault reported by dougfort@…, but not

sure if the way it is fixed doesn't introduce limitations on encodings.

* event.pathname represents now an absolute path.

* Fix display of events.

Files:

• pyinotify.py (modified) (6 diffs)
• unicode.py (added)

pyinotify.py

@@ -56 +56 @@
 __author__ = "seb@dbzteam.org (Sebastien Martini)"
 
-__version__ = "0.8.0q"
+__version__ = "0.8.0r"
 
 __metaclass__ = type  # Use new-style classes by default
@@ -363 +363 @@
 # all 'normal' events
 ALL_EVENTS = reduce(lambda x, y: x | y, EventsCodes.OP_FLAGS.itervalues())
+EventsCodes.ALL_FLAGS['ALL_EVENTS'] = ALL_EVENTS
+EventsCodes.ALL_VALUES[ALL_EVENTS] = 'ALL_EVENTS'
 
 
@@ -391 +393 @@
             elif isinstance(value, str) and not value:
                 value ="''"
-            if attr == 'pathname' and value and self.dir:
-                value += os.sep
             s += ' %s%s%s' % (color_theme.field_name(attr),
                               color_theme.punct('='),
@@ -462 +462 @@
         try:
             if self.name:
-                self.pathname = os.path.join(self.path, self.name)
+                self.pathname = os.path.abspath(os.path.join(self.path, 
+                                                             self.name))
             else:
-                self.pathname = self.path
+                self.pathname = os.path.abspath(self.path)
         except AttributeError:
             pass
@@ -1265 +1266 @@
         watch manager dictionary. Return the wd value.
         """
-        wd_ = LIBC.inotify_add_watch(self._fd, path, mask)
+        wd_ = LIBC.inotify_add_watch(self._fd,
+                                     ctypes.create_string_buffer(path),
+                                     mask)
         if wd_ < 0:
             return wd_
@@ -1409 +1412 @@
 
             if mask:
-                wd_ = LIBC.inotify_add_watch(self._fd, apath, mask)
+                addw = LIBC.inotify_add_watch
+                wd_ = addw(self._fd,
+                           ctypes.create_string_buffer(apath),
+                           mask)
                 if wd_ < 0:
                     ret_[awd] = False