libarchive: open_zipped() does not need to check extensions for e.g. gzip

[oweals/busybox.git] / libbb / bb_pwd.c

diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c
index d728577714f0017cc20386b5601763f5f0219582..8250cd446d84c76a777bdb74725ccad0ce0fb543 100644 (file)
--- a/libbb/bb_pwd.c
+++ b/libbb/bb_pwd.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * Copyright (C) 2008 by Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
@@ -72,13 +72,13 @@ char* FAST_FUNC gid2group(gid_t gid)
        return (gr) ? gr->gr_name : NULL;
 }
 
-char* FAST_FUNC uid2uname_utoa(long uid)
+char* FAST_FUNC uid2uname_utoa(uid_t uid)
 {
        char *name = uid2uname(uid);
        return (name) ? name : utoa(uid);
 }
 
-char* FAST_FUNC gid2group_utoa(long gid)
+char* FAST_FUNC gid2group_utoa(gid_t gid)
 {
        char *name = gid2group(gid);
        return (name) ? name : utoa(gid);
@@ -110,3 +110,51 @@ unsigned long FAST_FUNC get_ug_id(const char *s,
                return xname2id(s);
        return r;
 }
+
+/* Experimental "mallocing" API.
+ * The goal is nice: "we want to support a case when "guests" group is very large"
+ * but the code is butt-ugly.
+ */
+#if 0
+static char *find_latest(char last, char *cp)
+{
+       if (!cp)
+               return last;
+       cp += strlen(cp) + 1;
+       if (last < cp)
+               last = cp;
+       return last;
+}
+
+struct group* FAST_FUNC xmalloc_getgrnam(const char *name)
+{
+       struct {
+               struct group gr;
+               // May still be not enough!
+               char buf[64*1024 - sizeof(struct group) - 16];
+       } *s;
+       struct group *grp;
+       int r;
+       char *last;
+       char **gr_mem;
+
+       s = xmalloc(sizeof(*s));
+       r = getgrnam_r(name, &s->gr, s->buf, sizeof(s->buf), &grp);
+       if (!grp) {
+               free(s);
+               return grp;
+       }
+       last = find_latest(s->buf, grp->gr_name);
+       last = find_latest(last, grp->gr_passwd);
+       gr_mem = grp->gr_mem;
+       while (*gr_mem)
+               last = find_latest(last, *gr_mem++);
+       gr_mem++; /* points past NULL */
+       if (last < (char*)gr_mem)
+               last = (char*)gr_mem;
+//FIXME: what if we get not only truncated, but also moved here?
+// grp->gr_name pointer and friends are invalid now!!!
+       s = xrealloc(s, last - (char*)s);
+       return grp;
+}
+#endif