git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon: Fix grep and related to work on absolute symbolic links (RHBZ#579608).
[libguestfs.git]
/
daemon
/
scrub.c
diff --git
a/daemon/scrub.c
b/daemon/scrub.c
index
2f14bcb
..
573385f
100644
(file)
--- a/
daemon/scrub.c
+++ b/
daemon/scrub.c
@@
-26,18
+26,23
@@
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
+#include "optgroups.h"
int
int
-do_scrub_device (char *device)
+optgroup_scrub_available (void)
+{
+ return prog_exists ("scrub");
+}
+
+int
+do_scrub_device (const char *device)
{
char *err;
int r;
{
char *err;
int r;
- IS_DEVICE (device, -1);
-
r = command (NULL, &err, "scrub", device, NULL);
if (r == -1) {
r = command (NULL, &err, "scrub", device, NULL);
if (r == -1) {
- reply_with_error ("
scrub_device:
%s: %s", device, err);
+ reply_with_error ("%s: %s", device, err);
free (err);
return -1;
}
free (err);
return -1;
}
@@
-48,29
+53,23
@@
do_scrub_device (char *device)
}
int
}
int
-do_scrub_file (char *file)
+do_scrub_file (c
onst c
har *file)
{
char *buf;
{
char *buf;
- int len;
char *err;
int r;
char *err;
int r;
- NEED_ROOT (-1);
- ABS_PATH (file, -1);
-
/* Make the path relative to /sysroot. */
/* Make the path relative to /sysroot. */
- len = strlen (file) + 9;
- buf = malloc (len);
+ buf = sysroot_path (file);
if (!buf) {
reply_with_perror ("malloc");
return -1;
}
if (!buf) {
reply_with_perror ("malloc");
return -1;
}
- snprintf (buf, len, "/sysroot%s", file);
r = command (NULL, &err, "scrub", "-r", buf, NULL);
free (buf);
if (r == -1) {
r = command (NULL, &err, "scrub", "-r", buf, NULL);
free (buf);
if (r == -1) {
- reply_with_error ("
scrub_file:
%s: %s", file, err);
+ reply_with_error ("%s: %s", file, err);
free (err);
return -1;
}
free (err);
return -1;
}
@@
-81,29
+80,23
@@
do_scrub_file (char *file)
}
int
}
int
-do_scrub_freespace (char *dir)
+do_scrub_freespace (c
onst c
har *dir)
{
char *buf;
{
char *buf;
- int len;
char *err;
int r;
char *err;
int r;
- NEED_ROOT (-1);
- ABS_PATH (dir, -1);
-
/* Make the path relative to /sysroot. */
/* Make the path relative to /sysroot. */
- len = strlen (dir) + 9;
- buf = malloc (len);
+ buf = sysroot_path (dir);
if (!buf) {
reply_with_perror ("malloc");
return -1;
}
if (!buf) {
reply_with_perror ("malloc");
return -1;
}
- snprintf (buf, len, "/sysroot%s", dir);
r = command (NULL, &err, "scrub", "-X", buf, NULL);
free (buf);
if (r == -1) {
r = command (NULL, &err, "scrub", "-X", buf, NULL);
free (buf);
if (r == -1) {
- reply_with_error ("
scrub_freespace:
%s: %s", dir, err);
+ reply_with_error ("%s: %s", dir, err);
free (err);
return -1;
}
free (err);
return -1;
}