Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/inetd.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/inetd.c (modified) (10 diffs)

branches/3.3/mindi-busybox/networking/inetd.c

@@ -171 +171 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #if ENABLE_FEATURE_INETD_RPC
@@ -328 +329 @@
     char line[256];          /* _at least_ 256, see LINE_SIZE */
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 enum { LINE_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line) };
-struct BUG_G_too_big {
-    char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
-};
 #define rlim_ofile_cur  (G.rlim_ofile_cur )
 #define rlim_ofile      (G.rlim_ofile     )
@@ -353 +351 @@
 #define line            (G.line           )
 #define INIT_G() do { \
+    setup_common_bufsiz(); \
+    BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
     rlim_ofile_cur = OPEN_MAX; \
     global_queuelen = 128; \
@@ -646 +646 @@
 
 /* gcc generates much more code if this is inlined */
-static servtab_t *parse_one_line(void)
+static NOINLINE servtab_t *parse_one_line(void)
 {
     int argc;
@@ -676 +676 @@
             free(default_local_hostname);
             default_local_hostname = sep->se_local_hostname;
+            /*sep->se_local_hostname = NULL; - redundant */
+            /* (we'll overwrite this field anyway) */
             goto more;
         }
@@ -689 +691 @@
         bb_error_msg("parse error on line %u, line is ignored",
                 parser->lineno);
-        free_servtab_strings(sep);
         /* Just "goto more" can make sep to carry over e.g.
          * "rpc"-ness (by having se_rpcver_lo != 0).
          * We will be more paranoid: */
+        free_servtab_strings(sep);
         free(sep);
         goto new;
@@ -726 +728 @@
 #endif
         }
-        if (strncmp(arg, "rpc/", 4) == 0) {
+        if (is_prefixed_with(arg, "rpc/")) {
 #if ENABLE_FEATURE_INETD_RPC
             unsigned n;
@@ -816 +818 @@
 #endif
     argc = 0;
-    while ((arg = token[6+argc]) != NULL && argc < MAXARGV)
+    while (argc < MAXARGV && (arg = token[6+argc]) != NULL)
         sep->se_argv[argc++] = xstrdup(arg);
     /* Some inetd.conf files have no argv's, not even argv[0].
@@ -835 +837 @@
     }
 
-//  bb_info_msg(
-//      "ENTRY[%s][%s][%s][%d][%d][%d][%d][%d][%s][%s][%s]",
-//      sep->se_local_hostname, sep->se_service, sep->se_proto, sep->se_wait, sep->se_proto_no,
-//      sep->se_max, sep->se_count, sep->se_time, sep->se_user, sep->se_group, sep->se_program);
+    //bb_error_msg(
+    //  "ENTRY[%s][%s][%s][%d][%d][%d][%d][%d][%s][%s][%s]",
+    //  sep->se_local_hostname, sep->se_service, sep->se_proto, sep->se_wait, sep->se_proto_no,
+    //  sep->se_max, sep->se_count, sep->se_time, sep->se_user, sep->se_group, sep->se_program);
 
     /* check if the hostname specifier is a comma separated list
@@ -1655 +1657 @@
     time_t t;
 
-    t = time(NULL);
+    time(&t);
     fdprintf(s, "%.24s\r\n", ctime(&t));
 }