strdup -> xstrdup

diff --git a/fsinfo/fsi_analyze.c b/fsinfo/fsi_analyze.c
index f1721a0d1d9d89eb4badd4e8ca6a05dffd6b95bf..be753d9cdaf3d1e1d69eafc257f190131d6d6914 100644 (file)
--- a/fsinfo/fsi_analyze.c
+++ b/fsinfo/fsi_analyze.c
@@ -141,7 +141,7 @@ static dict_ent *
 find_volname(char *nn)
 {
   dict_ent *de;
-  char *p = strdup(nn);
+  char *p = xstrdup(nn);
   char *q;
 
   do {
@@ -186,7 +186,7 @@ check_exportfs(qelem *q, fsi_mount *e)
        lwarning(mp->m_ioloc, "%s has duplicate exportfs data", mp->m_name);
       mp->m_exported = mp;
       if (!ISSET(mp->m_mask, DM_VOLNAME))
-       set_mount(mp, DM_VOLNAME, strdup(mp->m_name));
+       set_mount(mp, DM_VOLNAME, xstrdup(mp->m_name));
     } else {
       mp->m_exported = e;
     }
@@ -228,7 +228,7 @@ analyze_dkmount_tree(qelem *q, fsi_mount *parent, disk_fs *dk)
        lwarning(mp->m_ioloc, "sub-directory of %s is named \"default\"", parent->m_name);
       fsi_log("Changing name %s to %s", mp->m_name, n);
       XFREE(mp->m_name);
-      mp->m_name = strdup(n);
+      mp->m_name = xstrdup(n);
     }
 
     mp->m_name_len = strlen(mp->m_name);
@@ -286,7 +286,7 @@ analyze_dkmounts(disk_fs *dk, qelem *q)
       char nbuf[1024];
       compute_automount_point(nbuf, sizeof(nbuf), dk->d_host, mp2->m_volname);
       XFREE(mp2->m_name);
-      mp2->m_name = strdup(nbuf);
+      mp2->m_name = xstrdup(nbuf);
       fsi_log("%s:%s has default mount on %s", dk->d_host->h_hostname, dk->d_dev, mp2->m_name);
     } else {
       lerror(dk->d_ioloc, "no volname given for %s:%s", dk->d_host->h_hostname, dk->d_dev);
@@ -298,9 +298,9 @@ analyze_dkmounts(disk_fs *dk, qelem *q)
    * Fill in the disk mount point
    */
   if (!errors && mp2 && mp2->m_name)
-    dk->d_mountpt = strdup(mp2->m_name);
+    dk->d_mountpt = xstrdup(mp2->m_name);
   else
-    dk->d_mountpt = strdup("error");
+    dk->d_mountpt = xstrdup("error");
 
   /*
    * Analyze the mount tree
@@ -353,7 +353,7 @@ fixup_required_disk_info(disk_fs *dp)
        * "opts"
        */
       if (!ISSET(dp->d_mask, DF_OPTS))
-       set_disk_fs(dp, DF_OPTS, strdup("swap"));
+       set_disk_fs(dp, DF_OPTS, xstrdup("swap"));
 
       /*
        * "mount"
@@ -362,7 +362,7 @@ fixup_required_disk_info(disk_fs *dp)
        qelem *q = new_que();
        fsi_mount *m = new_mount();
 
-       m->m_name = strdup("swap");
+       m->m_name = xstrdup("swap");
        m->m_mount = new_que();
        ins_que(&m->m_q, q->q_back);
        dp->d_mount = q;
@@ -400,7 +400,7 @@ fixup_required_disk_info(disk_fs *dp)
        * "opts"
        */
       if (!ISSET(dp->d_mask, DF_OPTS))
-       set_disk_fs(dp, DF_OPTS, strdup("rw,defaults"));
+       set_disk_fs(dp, DF_OPTS, xstrdup("rw,defaults"));
 
     }
   }
@@ -427,18 +427,18 @@ fixup_required_mount_info(fsmount *fp, dict_ent *de)
   }
 
   if (!ISSET(fp->f_mask, FM_FSTYPE)) {
-    set_fsmount(fp, FM_FSTYPE, strdup("nfs"));
+    set_fsmount(fp, FM_FSTYPE, xstrdup("nfs"));
     fsi_log("set: fstype is %s", fp->f_fstype);
   }
 
   if (!ISSET(fp->f_mask, FM_OPTS)) {
-    set_fsmount(fp, FM_OPTS, strdup("rw,nosuid,grpid,defaults"));
+    set_fsmount(fp, FM_OPTS, xstrdup("rw,nosuid,grpid,defaults"));
     fsi_log("set: opts are %s", fp->f_opts);
   }
 
   if (!ISSET(fp->f_mask, FM_LOCALNAME)) {
     if (fp->f_ref) {
-      set_fsmount(fp, FM_LOCALNAME, strdup(fp->f_volname));
+      set_fsmount(fp, FM_LOCALNAME, xstrdup(fp->f_volname));
       fsi_log("set: localname is %s", fp->f_localname);
     } else {
       lerror(fp->f_ioloc, "cannot determine localname since volname %s is not uniquely defined", fp->f_volname);
@@ -485,7 +485,7 @@ analyze_mounts(host *hp)
 
   ITER(fp, fsmount, q) {
     char *p;
-    char *nn = strdup(fp->f_volname);
+    char *nn = xstrdup(fp->f_volname);
     int req;
     dict_ent *de = (dict_ent *) NULL;
     int found = 0;
@@ -635,7 +635,7 @@ analyze_automount_tree(qelem *q, char *pref, int lvl)
        lerror(ap->a_ioloc, "not allowed '/' in a directory name");
     xsnprintf(nname, sizeof(nname), "%s/%s", pref, ap->a_name);
     XFREE(ap->a_name);
-    ap->a_name = strdup(nname[1] == '/' ? nname + 1 : nname);
+    ap->a_name = xstrdup(nname[1] == '/' ? nname + 1 : nname);
     fsi_log("automount point %s:", ap->a_name);
     show_new("ana-automount");
 
@@ -649,7 +649,7 @@ analyze_automount_tree(qelem *q, char *pref, int lvl)
     } else if (ap->a_symlink) {
       fsi_log("\tsymlink to %s", ap->a_symlink);
     } else {
-      ap->a_volname = strdup(ap->a_name);
+      ap->a_volname = xstrdup(ap->a_name);
       fsi_log("\timplicit automount from %s", ap->a_volname);
       analyze_automount(ap);
     }

diff --git a/fsinfo/fsi_gram.y b/fsinfo/fsi_gram.y
index 2b1249a4504a1a6cd6d86f54b078975ec08f43a9..6be5a4fbd2c1f7c72a8cdd66197a0bf74dd8cdb2 100644 (file)
--- a/fsinfo/fsi_gram.y
+++ b/fsinfo/fsi_gram.y
@@ -200,7 +200,7 @@ automount :
 
 opt_auto_opts :
          /* empty */
-         { $$ = strdup(""); }
+         { $$ = xstrdup(""); }
 
        | tOPTS tSTR
          { $$ = $2; }

diff --git a/fsinfo/fsi_util.c b/fsinfo/fsi_util.c
index 6f08f8db8bc6f2db631672fcc05a7227e1936026..60d5a5567c4696193a7ebeb521de51ee05973f72 100644 (file)
--- a/fsinfo/fsi_util.c
+++ b/fsinfo/fsi_util.c
@@ -363,7 +363,7 @@ set_host(host *hp, int k, char *v)
   switch (k) {
 
   case HF_HOST:{
-      char *p = strdup(v);
+      char *p = xstrdup(v);
       dict_ent *de = dict_locate(dict_of_hosts, v);
 
       if (de)

diff --git a/fsinfo/fsinfo.c b/fsinfo/fsinfo.c
index 3f4b6dfe708c93eea6024901bff8ee4681fa5641..e10ffae00499b78ba18201a85bec9488a6b98123 100644 (file)
--- a/fsinfo/fsinfo.c
+++ b/fsinfo/fsinfo.c
@@ -213,7 +213,7 @@ find_username(void)
   if (!u)
     u = "root";
 
-  return strdup(u);
+  return xstrdup(u);
 }
 
 

diff --git a/fsinfo/wr_bparam.c b/fsinfo/wr_bparam.c
index 32e6779d927ad13d977fc4a83edc178ebe9a10b9..2f7ed07a5eb3d47229cb3ed550a0179c8d6023aa 100644 (file)
--- a/fsinfo/wr_bparam.c
+++ b/fsinfo/wr_bparam.c
@@ -56,7 +56,7 @@ static int
 write_nfsname(FILE *ef, fsmount *fp, char *hn)
 {
   int errors = 0;
-  char *h = strdup(fp->f_ref->m_dk->d_host->h_hostname);
+  char *h = xstrdup(fp->f_ref->m_dk->d_host->h_hostname);
 
  domain_strip(h, hn);
   fprintf(ef, "%s:%s", h, fp->f_volname);

diff --git a/fsinfo/wr_fstab.c b/fsinfo/wr_fstab.c
index eee2656b1e3f900befc71a3a0c776b1080eafcf4..a7a29f700db548f6042f48c01ad3e75d20a3b833 100644 (file)
--- a/fsinfo/wr_fstab.c
+++ b/fsinfo/wr_fstab.c
@@ -102,7 +102,7 @@ static struct os_fstab_type {
 static void
 write_aix1_dkfstab(FILE *ef, disk_fs *dp)
 {
-  char *hp = strdup(dp->d_host->h_hostname);
+  char *hp = xstrdup(dp->d_host->h_hostname);
   char *p = strchr(hp, '.');
 
   if (p)
@@ -123,8 +123,8 @@ write_aix1_dkfstab(FILE *ef, disk_fs *dp)
 static void
 write_aix1_dkrmount(FILE *ef, char *hn, fsmount *fp)
 {
-  char *h = strdup(fp->f_ref->m_dk->d_host->h_hostname);
-  char *hp = strdup(h);
+  char *h = xstrdup(fp->f_ref->m_dk->d_host->h_hostname);
+  char *hp = xstrdup(h);
   char *p = strchr(hp, '.');
 
   if (p)
@@ -172,7 +172,7 @@ write_aix3_dkfstab(FILE *ef, disk_fs *dp)
 static void
 write_aix3_dkrmount(FILE *ef, char *hn, fsmount *fp)
 {
-  char *h = strdup(fp->f_ref->m_dk->d_host->h_hostname);
+  char *h = xstrdup(fp->f_ref->m_dk->d_host->h_hostname);
 
   domain_strip(h, hn);
   fprintf(ef, "\n%s:\n\tdev = %s:%s\n\tvfs = %s\n\ttype = %s\n\tvol = %s\n\topts = %s\n\tmount = true\n\tcheck = true\n\tfree = false\n",
@@ -206,7 +206,7 @@ write_ultrix_dkfstab(FILE *ef, disk_fs *dp)
 static void
 write_ultrix_dkrmount(FILE *ef, char *hn, fsmount *fp)
 {
-  char *h = strdup(fp->f_ref->m_dk->d_host->h_hostname);
+  char *h = xstrdup(fp->f_ref->m_dk->d_host->h_hostname);
 
   domain_strip(h, hn);
   fprintf(ef, "%s@%s:%s:%s:%s:0:0\n",
@@ -243,9 +243,9 @@ write_generic_dkrmount(FILE *ef, char *hn, fsmount *fp)
   char *h;
 
   if (fp->f_ref) {
-    h = strdup(fp->f_ref->m_dk->d_host->h_hostname);
+    h = xstrdup(fp->f_ref->m_dk->d_host->h_hostname);
   } else {
-    h = strdup(fp->f_from);
+    h = xstrdup(fp->f_from);
   }
   domain_strip(h, hn);
   fprintf(ef, "%s:%s %s %s %s 0 0\n",