char *mp;
char *error;
- is_root = strcmp (mountpoint, "/") == 0;
+ ABS_PATH (mountpoint, 0, return -1);
+
+ is_root = STREQ (mountpoint, "/");
if (!root_mounted && !is_root) {
- reply_with_error ("mount: you must mount something on / first");
+ reply_with_error ("you must mount something on / first");
return -1;
}
"mount", "-o", options, device, mp, NULL);
free (mp);
if (r == -1) {
- reply_with_error ("mount: %s on %s: %s", device, mountpoint, error);
+ reply_with_error ("%s on %s: %s", device, mountpoint, error);
free (error);
return -1;
}
int
do_umount (const char *pathordevice)
{
- int freeit = 0, r;
- char *buf;
+ int r;
char *err;
+ char *buf;
+ int is_dev;
- if (strncmp (pathordevice, "/dev/", 5) == 0) {
- buf = pathordevice;
- RESOLVE_DEVICE (buf, return -1);
- } else {
- buf = sysroot_path (pathordevice);
- if (buf == NULL) {
- reply_with_perror ("malloc");
- return -1;
- }
- freeit = 1;
+ is_dev = STREQLEN (pathordevice, "/dev/", 5);
+ buf = is_dev ? strdup (pathordevice)
+ : sysroot_path (pathordevice);
+ if (buf == NULL) {
+ reply_with_perror ("malloc");
+ return -1;
}
+ if (is_dev)
+ RESOLVE_DEVICE (buf, 0, { free (buf); return -1; });
+
r = command (NULL, &err, "umount", buf, NULL);
- if (freeit) free (buf);
+ free (buf);
+
if (r == -1) {
- reply_with_error ("umount: %s: %s", pathordevice, err);
+ reply_with_error ("%s: %s", pathordevice, err);
free (err);
return -1;
}
free (mp);
free (buf);
if (r == -1) {
- reply_with_error ("mount: %s on %s: %s", file, mountpoint, error);
+ reply_with_error ("%s on %s: %s", file, mountpoint, error);
free (error);
return -1;
}
int r;
/* NEED_ROOT (return -1); - we don't want this test for this call. */
- ABS_PATH (path, return -1);
+ ABS_PATH (path, 0, return -1);
CHROOT_IN;
r = mkdir (path, 0777);
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("mkmountpoint: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}
{
int r;
+ /* NEED_ROOT (return -1); - we don't want this test for this call. */
+ ABS_PATH (path, 0, return -1);
+
CHROOT_IN;
r = rmdir (path);
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("rmmountpoint: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}