libudev: allow to store negative values in the udev database

[elogind.git] / extras / collect / collect.c

diff --git a/extras/collect/collect.c b/extras/collect/collect.c
index 355b85b5cfdb6199c63caa95bb1c5acf3b1d33a9..0069dea0df3c18c63ee93cfc28e4ee4ffcfaebdd 100644 (file)
--- a/extras/collect/collect.c
+++ b/extras/collect/collect.c
@@ -31,10 +31,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "../../udev/lib/libudev.h"
-#include "../../udev/lib/libudev-private.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
-#define TMPFILE                        UDEV_PREFIX "/dev/.udev/collect"
+#define TMPFILE                        "/dev/.udev/collect"
 #define BUFSIZE                        16
 #define UDEV_ALARM_TIMEOUT     180
 
@@ -124,7 +124,7 @@ static int prepare(char *dir, char *filename)
  * Read checkpoint file
  *
  * Tricky reading this. We allocate a buffer twice as large
- * as we're goint to read. Then we read into the upper half
+ * as we're going to read. Then we read into the upper half
  * of that buffer and start parsing.
  * Once we do _not_ find end-of-work terminator (whitespace
  * character) we move the upper half to the lower half,
@@ -171,8 +171,7 @@ static int checkout(int fd)
                                if (debug)
                                        fprintf(stderr, "Found word %s\n", word);
                                him = malloc(sizeof (struct _mate));
-                               him->name = malloc(strlen(word) + 1);
-                               strcpy(him->name, word);
+                               him->name = strdup(word);
                                him->state = STATE_OLD;
                                udev_list_node_append(&him->node, &bunch);
                                word = NULL;
@@ -332,8 +331,8 @@ static void everybody(void)
                case STATE_CONFIRMED:
                        state = "confirmed";
                        break;
-               fprintf(stderr, "ID: %s=%s\n", him->name, state);
                }
+               fprintf(stderr, "ID: %s=%s\n", him->name, state);
        }
 }