Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/parse_mode.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/libbb/parse_mode.c (modified) (5 diffs)

branches/3.3/mindi-busybox/libbb/parse_mode.c

@@ -16 +16 @@
 #define FILEMODEBITS (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
 
-int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode)
+int FAST_FUNC bb_parse_mode(const char *s, unsigned current_mode)
 {
     static const mode_t who_mask[] = {
@@ -47 +47 @@
         tmp = strtoul(s, &e, 8);
         if (*e || (tmp > 07777U)) { /* Check range and trailing chars. */
-            return 0;
+            return -1;
         }
-        *current_mode = tmp;
-        return 1;
+        return tmp;
     }
 
-    new_mode = *current_mode;
+    new_mode = current_mode;
 
     /* Note: we allow empty clauses, and hence empty modes.
@@ -72 +71 @@
                 wholist |= who_mask[(int)(p-who_chars)];
                 if (!*++s) {
-                    return 0;
+                    return -1;
                 }
                 goto WHO_LIST;
@@ -81 +80 @@
             if ((*s != '+') && (*s != '-')) {
                 if (*s != '=') {
-                    return 0;
+                    return -1;
                 }
                 /* Since op is '=', clear all bits corresponding to the
@@ -146 +145 @@
     }
 
-    *current_mode = new_mode;
-    return 1;
+    return new_mode;
 }