Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libpwdgrp/uidgid_get.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/libpwdgrp/uidgid_get.c (modified) (4 diffs)

branches/2.2.9/mindi-busybox/libpwdgrp/uidgid_get.c

@@ -29 +29 @@
 
 /* Always sets uid and gid */
-int get_uidgid(struct bb_uidgid_t *u, const char *ug, int numeric_ok)
+int FAST_FUNC get_uidgid(struct bb_uidgid_t *u, const char *ug, int numeric_ok)
 {
     struct passwd *pwd;
@@ -77 +77 @@
     return 1;
 }
+void FAST_FUNC xget_uidgid(struct bb_uidgid_t *u, const char *ug)
+{
+    if (!get_uidgid(u, ug, 1))
+        bb_error_msg_and_die("unknown user/group %s", ug);
+}
 
 /* chown-like:
@@ -83 +88 @@
  * "user:" sets uid and gid (to user's primary group id)
  * "user:group" sets uid and gid
- * ('unset' uid or gid is actually set to -1)
+ * ('unset' uid or gid retains the value it has on entry)
  */
-void parse_chown_usergroup_or_die(struct bb_uidgid_t *u, char *user_group)
+void FAST_FUNC parse_chown_usergroup_or_die(struct bb_uidgid_t *u, char *user_group)
 {
     char *group;
-
-    u->uid = -1;
-    u->gid = -1;
 
     /* Check if there is a group name */
@@ -107 +109 @@
         if (!group[1]) /* "user:" */
             *group = '\0';
-        if (!get_uidgid(u, user_group, 1))
-            bb_error_msg_and_die("unknown user/group %s", user_group);
+        xget_uidgid(u, user_group);
     }
 }