Fix a logger bug.

 -Erik

diff --git a/Changelog b/Changelog
index 52b34b663a103d60d7c50559e11108fb21befd4b..8235980337f580f2d27d70e94197990ad7156044 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,9 @@
        * Fixed a bug in both cp and mv preventing 'cp foo/README bar'
            type commands (file in a directory to another directory) 
            from working.
+       * Fixed a logger bug that caused garbage to be written to the syslog 
+           (unless you used busybox syslog, which hid the bug).  Thanks
+           to Alex Holden <alex@linuxhacker.org> for the fix.
 
        -Erik Andersen, 
 

diff --git a/logger.c b/logger.c
index 35bbb669286b2405e93d96149d1c9fbdd402cd1a..7aada5dbc293d2f2f58865d937ba3a0413fc5f81 100644 (file)
--- a/logger.c
+++ b/logger.c
@@ -186,7 +186,7 @@ extern int logger_main(int argc, char **argv)
     if (toStdErrFlag==TRUE)
        fprintf(stderr, "%s\n", buf);
 
-    write( fd, buf, sizeof(buf));
+    write( fd, buf, strlen(buf)+1);
 
     close(fd);
     exit( TRUE);

diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 35bbb669286b2405e93d96149d1c9fbdd402cd1a..7aada5dbc293d2f2f58865d937ba3a0413fc5f81 100644 (file)
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -186,7 +186,7 @@ extern int logger_main(int argc, char **argv)
     if (toStdErrFlag==TRUE)
        fprintf(stderr, "%s\n", buf);
 
-    write( fd, buf, sizeof(buf));
+    write( fd, buf, strlen(buf)+1);
 
     close(fd);
     exit( TRUE);