/* Return the value of the hexadecimal number represented by CP.
No prefix (like '0x') or suffix (like 'h') is expected to be
part of CP. */
+/* FIXME: this can overflow */
static int
-xatoi (cp)
- char *cp;
+xatoi (char *cp)
{
int val;
fsp_to_string (const struct statfs *fsp)
{
# if defined HAVE_F_FSTYPENAME_IN_STATFS
- return xstrdup (fsp->f_fstypename);
+ return fsp->f_fstypename;
# else
return fstype_to_string (fsp->f_type);
# endif
#ifdef MOUNTED_VMOUNT /* AIX. */
static char *
-fstype_to_string (t)
- int t;
+fstype_to_string (int t)
{
struct vfs_ent *e;
/* Return a list of the currently mounted filesystems, or NULL on error.
Add each entry to the tail of the list so that they stay in order.
If NEED_FS_TYPE is nonzero, ensure that the filesystem type fields in
- the returned list are valid. Otherwise, they might not be.
- If ALL_FS is zero, do not return entries for filesystems that
- are automounter (dummy) entries. */
+ the returned list are valid. Otherwise, they might not be. */
struct mount_entry *
-read_filesystem_list (need_fs_type, all_fs)
- int need_fs_type, all_fs;
+read_filesystem_list (int need_fs_type)
{
struct mount_entry *mount_list;
struct mount_entry *me;
- struct mount_entry *mtail;
-
- /* Start the list off with a dummy entry. */
- me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
- me->me_next = NULL;
- mount_list = mtail = me;
+ struct mount_entry **mtail = &mount_list;
#ifdef MOUNTED_LISTMNTENT
{
if(listmntent(&mntlist, KMTAB, NULL, NULL) < 0)
return NULL;
- p = mntlist;
- while(p){
+ for (p = mntlist; p; p = p->next) {
mnt = p->ment;
me = (struct mount_entry*) xmalloc(sizeof (struct mount_entry));
me->me_devname = xstrdup(mnt->mnt_fsname);
me->me_mountdir = xstrdup(mnt->mnt_dir);
me->me_type = xstrdup(mnt->mnt_type);
+ me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
+ me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
me->me_dev = -1;
- me->me_next = NULL;
- mtail->me_next = me;
- mtail = me;
- p = p->next;
+ *mtail = me;
+ mtail = &me->me_next;
}
freemntlist(mntlist);
}
while ((mnt = getmntent (fp)))
{
- if (!all_fs && (!strcmp (mnt->mnt_type, "ignore")
- || !strcmp (mnt->mnt_type, "auto")))
- continue;
-
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
me->me_devname = xstrdup (mnt->mnt_fsname);
me->me_mountdir = xstrdup (mnt->mnt_dir);
me->me_type = xstrdup (mnt->mnt_type);
+ me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
+ me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
devopt = strstr (mnt->mnt_opts, "dev=");
if (devopt)
{
}
else
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
- me->me_next = NULL;
/* Add to the linked list. */
- mtail->me_next = me;
- mtail = me;
+ *mtail = me;
+ mtail = &me->me_next;
}
if (endmntent (fp) == 0)
- return NULL;
+ goto free_then_fail;
}
#endif /* MOUNTED_GETMNTENT1. */
entries = getmntinfo (&fsp, MNT_NOWAIT);
if (entries < 0)
return NULL;
- while (entries-- > 0)
+ for (; entries-- > 0; fsp++)
{
+ char *fs_type = fsp_to_string (fsp);
+
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
me->me_devname = xstrdup (fsp->f_mntfromname);
me->me_mountdir = xstrdup (fsp->f_mntonname);
- me->me_type = fsp_to_string (fsp);
+ me->me_type = fs_type;
+ me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
+ me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
- me->me_next = NULL;
/* Add to the linked list. */
- mtail->me_next = me;
- mtail = me;
- fsp++;
+ *mtail = me;
+ mtail = &me->me_next;
}
}
#endif /* MOUNTED_GETMNTINFO */
int val;
struct fs_data fsd;
- while ((val = getmnt (&offset, &fsd, sizeof (fsd), NOSTAT_MANY,
- (char *) 0)) > 0)
+ while (errno = 0,
+ 0 < (val = getmnt (&offset, &fsd, sizeof (fsd), NOSTAT_MANY,
+ (char *) 0)))
{
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
me->me_devname = xstrdup (fsd.fd_req.devname);
me->me_mountdir = xstrdup (fsd.fd_req.path);
me->me_type = gt_names[fsd.fd_req.fstype];
+ me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
+ me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
me->me_dev = fsd.fd_req.dev;
- me->me_next = NULL;
/* Add to the linked list. */
- mtail->me_next = me;
- mtail = me;
+ *mtail = me;
+ mtail = &me->me_next;
}
if (val < 0)
- return NULL;
+ goto free_then_fail;
}
#endif /* MOUNTED_GETMNT. */
me->me_devname = xstrdup (stats[counter].f_mntfromname);
me->me_mountdir = xstrdup (stats[counter].f_mntonname);
me->me_type = mnt_names[stats[counter].f_type];
+ me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
+ me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
- me->me_next = NULL;
/* Add to the linked list. */
- mtail->me_next = me;
- mtail = me;
+ *mtail = me;
+ mtail = &me->me_next;
}
free (stats);
me->me_type = xstrdup (typebuf);
}
# endif
- me->me_next = NULL;
+ me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
+ me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
/* Add to the linked list. */
- mtail->me_next = me;
- mtail = me;
+ *mtail = me;
+ mtail = &me->me_next;
+ }
+
+ if (ferror (fp))
+ {
+ int saved_errno = errno;
+ fclose (fp);
+ errno = saved_errno;
+ goto free_then_fail;
}
if (fclose (fp) == EOF)
- return NULL;
+ goto free_then_fail;
}
#endif /* MOUNTED_FREAD || MOUNTED_FREAD_FSTYP. */
me->me_devname = xstrdup ( (*ent)->mt_resource);
me->me_mountdir = xstrdup( (*ent)->mt_directory);
me->me_type = xstrdup ((*ent)->mt_fstype);
+ me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
+ me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
- me->me_next = NULL;
/* Add to the linked list. */
- mtail->me_next = me;
- mtail = me;
+ *mtail = me;
+ mtail = &me->me_next;
}
endmnttbl();
}
flock.l_len = 0;
while (fcntl (lockfd, F_SETLKW, &flock) == -1)
if (errno != EINTR)
- return NULL;
+ {
+ int saved_errno = errno;
+ close (lockfd);
+ errno = saved_errno;
+ return NULL;
+ }
}
+ else if (errno != ENOENT)
+ return NULL;
# endif
+ errno = 0;
fp = fopen (table, "r");
if (fp == NULL)
- ret = 1;
+ ret = errno;
else
{
while ((ret = getmntent (fp, &mnt)) == 0)
{
- /* Don't show automounted filesystems twice on e.g., Solaris. */
- if (!all_fs && MNT_IGNORE (&mnt))
- continue;
-
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
me->me_devname = xstrdup (mnt.mnt_special);
me->me_mountdir = xstrdup (mnt.mnt_mountp);
me->me_type = xstrdup (mnt.mnt_fstype);
+ me->me_dummy = MNT_IGNORE (&mnt) != 0;
+ me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
- me->me_next = NULL;
/* Add to the linked list. */
- mtail->me_next = me;
- mtail = me;
+ *mtail = me;
+ mtail = &me->me_next;
}
- if (fclose (fp) == EOF)
- ret = 1;
+ ret = fclose (fp) == EOF ? errno : 0 < ret ? 0 : -1;
}
if (0 <= lockfd && close (lockfd) != 0)
- return NULL;
+ ret = errno;
- if (ret > 0)
- return NULL;
+ if (0 <= ret)
+ {
+ errno = ret;
+ goto free_then_fail;
+ }
}
#endif /* MOUNTED_GETMNTENT2. */
{
char *host, *path;
+ me->me_remote = 1;
/* Prepend the remote pathname. */
host = thisent + vmp->vmt_data[VMT_HOSTNAME].vmt_off;
path = thisent + vmp->vmt_data[VMT_OBJECT].vmt_off;
}
else
{
+ me->me_remote = 0;
me->me_devname = xstrdup (thisent +
vmp->vmt_data[VMT_OBJECT].vmt_off);
}
me->me_mountdir = xstrdup (thisent + vmp->vmt_data[VMT_STUB].vmt_off);
me->me_type = xstrdup (fstype_to_string (vmp->vmt_gfstype));
+ me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
me->me_dev = (dev_t) -1; /* vmt_fsid might be the info we want. */
- me->me_next = NULL;
/* Add to the linked list. */
- mtail->me_next = me;
- mtail = me;
+ *mtail = me;
+ mtail = &me->me_next;
}
free (entries);
}
#endif /* MOUNTED_VMOUNT. */
- /* Free the dummy head. */
- me = mount_list;
- mount_list = mount_list->me_next;
- free (me);
+ *mtail = NULL;
return mount_list;
+
+
+ free_then_fail:
+ {
+ int saved_errno = errno;
+ *mtail = NULL;
+
+ while (mount_list)
+ {
+ me = mount_list->me_next;
+ free (mount_list->me_devname);
+ free (mount_list->me_mountdir);
+ /* FIXME: me_type is not always malloced. */
+ free (mount_list);
+ mount_list = me;
+ }
+
+ errno = saved_errno;
+ return NULL;
+ }
}
projects / gnulib.git / blobdiff