- strndupa is a GNU extension. Using strdup to avoid several errors like:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Wed, 20 Jun 2007 09:56:47 +0000 (09:56 -0000)
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Wed, 20 Jun 2007 09:56:47 +0000 (09:56 -0000)
  util-linux/mdev.c:(.text+0x29a): undefined reference to `strndupa'

util-linux/mdev.c

index 8743cdb6b617e77e171daeaad04b84d5f0ead8c0..22005aaee4f4480cabfc26aa68fa61f5669da475 100644 (file)
@@ -90,7 +90,7 @@ static void make_device(char *path, int delete)
                                if (field == 0) {
                                        /* Regex to match this device */
 
-                                       char *regex = strndupa(pos, end2-pos);
+                                       char *regex = xstrndup(pos, end2-pos);
                                        regex_t match;
                                        regmatch_t off;
                                        int result;
@@ -99,6 +99,7 @@ static void make_device(char *path, int delete)
                                        xregcomp(&match,regex, REG_EXTENDED);
                                        result = regexec(&match, device_name, 1, &off, 0);
                                        regfree(&match);
+                                       free(regex);
 
                                        /* If not this device, skip rest of line */
                                        if (result || off.rm_so
@@ -119,7 +120,9 @@ static void make_device(char *path, int delete)
                                        uid = strtoul(pos, &s2, 10);
                                        if (s != s2) {
                                                struct passwd *pass;
-                                               pass = getpwnam(strndupa(pos, s-pos));
+                                               char *_unam = xstrndup(pos, s-pos);
+                                               pass = getpwnam(_unam);
+                                               free(_unam);
                                                if (!pass) break;
                                                uid = pass->pw_uid;
                                        }
@@ -128,7 +131,9 @@ static void make_device(char *path, int delete)
                                        gid = strtoul(s, &s2, 10);
                                        if (end2 != s2) {
                                                struct group *grp;
-                                               grp = getgrnam(strndupa(s, end2-s));
+                                               char *_grnam = xstrndup(s, end2-s);
+                                               grp = getgrnam(_grnam);
+                                               free(_grnam);
                                                if (!grp) break;
                                                gid = grp->gr_gid;
                                        }