git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debian: Ignore Debian appliance root when looking for translatable files.
[libguestfs.git]
/
daemon
/
scrub.c
diff --git
a/daemon/scrub.c
b/daemon/scrub.c
index
f1601f9
..
15c8b6c
100644
(file)
--- a/
daemon/scrub.c
+++ b/
daemon/scrub.c
@@
-28,13
+28,11
@@
#include "actions.h"
int
#include "actions.h"
int
-do_scrub_device (char *device)
+do_scrub_device (c
onst c
har *device)
{
char *err;
int r;
{
char *err;
int r;
- RESOLVE_DEVICE (device, return -1);
-
r = command (NULL, &err, "scrub", device, NULL);
if (r == -1) {
reply_with_error ("scrub_device: %s: %s", device, err);
r = command (NULL, &err, "scrub", device, NULL);
if (r == -1) {
reply_with_error ("scrub_device: %s: %s", device, err);
@@
-48,15
+46,12
@@
do_scrub_device (char *device)
}
int
}
int
-do_scrub_file (char *file)
+do_scrub_file (c
onst c
har *file)
{
char *buf;
char *err;
int r;
{
char *buf;
char *err;
int r;
- NEED_ROOT (-1);
- ABS_PATH (file, return -1);
-
/* Make the path relative to /sysroot. */
buf = sysroot_path (file);
if (!buf) {
/* Make the path relative to /sysroot. */
buf = sysroot_path (file);
if (!buf) {
@@
-78,15
+73,12
@@
do_scrub_file (char *file)
}
int
}
int
-do_scrub_freespace (char *dir)
+do_scrub_freespace (c
onst c
har *dir)
{
char *buf;
char *err;
int r;
{
char *buf;
char *err;
int r;
- NEED_ROOT (-1);
- ABS_PATH (dir, return -1);
-
/* Make the path relative to /sysroot. */
buf = sysroot_path (dir);
if (!buf) {
/* Make the path relative to /sysroot. */
buf = sysroot_path (dir);
if (!buf) {