sed: simpler fix for recent GNU compat stuff (by Rob Landley)

[oweals/busybox.git] / libpwdgrp / uidgid_get.c

diff --git a/libpwdgrp/uidgid_get.c b/libpwdgrp/uidgid_get.c
index a2d02a84ff02691e40ce4cc5c6463dd6d24de214..92290bfdb65dc74f5175b5b6f16b7729f889baf4 100644 (file)
--- a/libpwdgrp/uidgid_get.c
+++ b/libpwdgrp/uidgid_get.c
@@ -1,31 +1,116 @@
-#include "busybox.h"
+/*
+Copyright (c) 2001-2006, Gerrit Pape
+All rights reserved.
 
-unsigned uidgid_get(struct bb_uidgid_t *u, const char *ug /*, unsigned dogrp */)
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+   3. The name of the author may not be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "libbb.h"
+
+/* Always sets uid and gid */
+int FAST_FUNC get_uidgid(struct bb_uidgid_t *u, const char *ug, int numeric_ok)
 {
        struct passwd *pwd;
        struct group *gr;
-       const char *g;
-
-       /* g = 0; if (dogrp) g = strchr(ug, ':'); */
-       g = strchr(ug, ':');
-       if (g) {
-               int sz = (++g) - ug;
-               char buf[sz];
-               safe_strncpy(buf, ug, sz);
-               pwd = getpwnam(buf);
-       } else
-               pwd = getpwnam(ug);
+       char *user, *group;
+       unsigned n;
+
+       user = (char*)ug;
+       group = strchr(ug, ':');
+       if (group) {
+               int sz = (++group) - ug;
+               user = alloca(sz);
+               /* copies sz-1 bytes, stores terminating '\0' */
+               safe_strncpy(user, ug, sz);
+       }
+       if (numeric_ok) {
+               n = bb_strtou(user, NULL, 10);
+               if (!errno) {
+                       u->uid = n;
+                       pwd = getpwuid(n);
+                       /* If we have e.g. "500" string without user */
+                       /* with uid 500 in /etc/passwd, we set gid == uid */
+                       u->gid = pwd ? pwd->pw_gid : n;
+                       goto skip;
+               }
+       }
+       /* Either it is not numeric, or caller disallows numeric username */
+       pwd = getpwnam(user);
        if (!pwd)
                return 0;
        u->uid = pwd->pw_uid;
        u->gid = pwd->pw_gid;
-       if (g) {
-               gr = getgrnam(g);
+
+ skip:
+       if (group) {
+               if (numeric_ok) {
+                       n = bb_strtou(group, NULL, 10);
+                       if (!errno) {
+                               u->gid = n;
+                               return 1;
+                       }
+               }
+               gr = getgrnam(group);
                if (!gr) return 0;
                u->gid = gr->gr_gid;
        }
        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:
+ * "user" sets uid only,
+ * ":group" sets gid only
+ * "user:" sets uid and gid (to user's primary group id)
+ * "user:group" sets uid and gid
+ * ('unset' uid or gid retains the value it has on entry)
+ */
+void FAST_FUNC parse_chown_usergroup_or_die(struct bb_uidgid_t *u, char *user_group)
+{
+       char *group;
+
+       /* Check if there is a group name */
+       group = strchr(user_group, '.'); /* deprecated? */
+       if (!group)
+               group = strchr(user_group, ':');
+       else
+               *group = ':'; /* replace '.' with ':' */
+
+       /* Parse "user[:[group]]" */
+       if (!group) { /* "user" */
+               u->uid = get_ug_id(user_group, xuname2uid);
+       } else if (group == user_group) { /* ":group" */
+               u->gid = get_ug_id(group + 1, xgroup2gid);
+       } else {
+               if (!group[1]) /* "user:" */
+                       *group = '\0';
+               xget_uidgid(u, user_group);
+       }
+}
 
 #if 0
 #include <stdio.h>
@@ -33,16 +118,16 @@ int main()
 {
        unsigned u;
        struct bb_uidgid_t ug;
-       u = uidgid_get(&ug, "apache");
+       u = get_uidgid(&ug, "apache", 0);
        printf("%u = %u:%u\n", u, ug.uid, ug.gid);
        ug.uid = ug.gid = 1111;
-       u = uidgid_get(&ug, "apache");
+       u = get_uidgid(&ug, "apache", 0);
        printf("%u = %u:%u\n", u, ug.uid, ug.gid);
        ug.uid = ug.gid = 1111;
-       u = uidgid_get(&ug, "apache:users");
+       u = get_uidgid(&ug, "apache:users", 0);
        printf("%u = %u:%u\n", u, ug.uid, ug.gid);
        ug.uid = ug.gid = 1111;
-       u = uidgid_get(&ug, "apache:users");
+       u = get_uidgid(&ug, "apache:users", 0);
        printf("%u = %u:%u\n", u, ug.uid, ug.gid);
        return 0;
 }