Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/sysklogd/logger.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/sysklogd/logger.c (modified) (5 diffs)

branches/2.2.9/mindi-busybox/sysklogd/logger.c

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+/*
+ * Done in syslogd_and_logger.c:
 #include "libbb.h"
-
-#if !defined CONFIG_SYSLOGD
-
 #define SYSLOG_NAMES
-#include <sys/syslog.h>
-
-#else
-#include <sys/syslog.h>
-#  ifndef __dietlibc__
-    /* We have to do this since the header file defines static
-     * structures.  Argh.... bad libc, bad, bad...
-     */
-    typedef struct _code {
-        char *c_name;
-        int c_val;
-    } CODE;
-    extern CODE prioritynames[];
-    extern CODE facilitynames[];
-#  endif
-#endif
+#define SYSLOG_NAMES_CONST
+#include <syslog.h>
+*/
 
 /* Decode a symbolic name to a numeric value
@@ -37 +23 @@
  * Original copyright notice is retained at the end of this file.
  */
-static int decode(char *name, CODE * codetab)
+static int decode(char *name, const CODE *codetab)
 {
-    CODE *c;
+    const CODE *c;
 
     if (isdigit(*name))
@@ -81 +67 @@
 }
 
+#define strbuf bb_common_bufsiz1
 
-int logger_main(int argc, char **argv);
-int logger_main(int argc, char **argv)
+int logger_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int logger_main(int argc UNUSED_PARAM, char **argv)
 {
     char *str_p, *str_t;
+    int opt;
     int i = 0;
-    char name[80];
 
     /* Fill out the name string early (may be overwritten later) */
-    bb_getpwuid(name, sizeof(name), geteuid());
-    str_t = name;
+    str_t = uid2uname_utoa(geteuid());
 
     /* Parse any options */
-    getopt32(argv, "p:st:", &str_p, &str_t);
+    opt = getopt32(argv, "p:st:", &str_p, &str_t);
 
-    if (option_mask32 & 0x2) /* -s */
+    if (opt & 0x2) /* -s */
         i |= LOG_PERROR;
-    //if (option_mask32 & 0x4) /* -t */
+    //if (opt & 0x4) /* -t */
     openlog(str_t, i, 0);
     i = LOG_USER | LOG_NOTICE;
-    if (option_mask32 & 0x1) /* -p */
+    if (opt & 0x1) /* -p */
         i = pencode(str_p);
 
-    argc -= optind;
     argv += optind;
-    if (!argc) {
-#define strbuf bb_common_bufsiz1
+    if (!argv[0]) {
         while (fgets(strbuf, COMMON_BUFSIZE, stdin)) {
             if (strbuf[0]
@@ -133 +117 @@
 }
 
+/* Clean up. Needed because we are included from syslogd_and_logger.c */
+#undef strbuf
 
 /*-
  * Copyright (c) 1983, 1993
- *  The Regents of the University of California.  All rights reserved.
+ * The Regents of the University of California.  All rights reserved.
  *
  * This is the original license statement for the decode and pencode functions.
@@ -149 +135 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
- *      ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
+ * 3. BSD Advertising Clause omitted per the July 22, 1999 licensing change
+ *    ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
  *
  * 4. Neither the name of the University nor the names of its contributors