git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mac OS X: For PATH_MAX, include <limits.h>
[libguestfs.git]
/
daemon
/
wc.c
diff --git
a/daemon/wc.c
b/daemon/wc.c
index
91e1942
..
fe27bf1
100644
(file)
--- a/
daemon/wc.c
+++ b/
daemon/wc.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-28,23
+28,18
@@
#include "actions.h"
static int
#include "actions.h"
static int
-wc (c
har *flag,
char *path)
+wc (c
onst char *flag, const
char *path)
{
char *buf;
char *out, *err;
{
char *buf;
char *out, *err;
- int r, len;
-
- NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ int r;
/* Make the path relative to /sysroot. */
/* Make the path relative to /sysroot. */
- len = strlen (path) + 9;
- buf = malloc (len);
+ buf = sysroot_path (path);
if (!buf) {
reply_with_perror ("malloc");
return -1;
}
if (!buf) {
reply_with_perror ("malloc");
return -1;
}
- snprintf (buf, len, "/sysroot%s", path);
r = command (&out, &err, "wc", flag, buf, NULL);
free (buf);
r = command (&out, &err, "wc", flag, buf, NULL);
free (buf);
@@
-65,7
+60,7
@@
wc (char *flag, char *path)
/* Parse the number. */
if (sscanf (out, "%d", &r) != 1) {
/* Parse the number. */
if (sscanf (out, "%d", &r) != 1) {
- reply_with_error ("
wc:
cannot parse number: %s", out);
+ reply_with_error ("cannot parse number: %s", out);
free (out);
return -1;
}
free (out);
return -1;
}
@@
-75,19
+70,19
@@
wc (char *flag, char *path)
}
int
}
int
-do_wc_l (char *path)
+do_wc_l (c
onst c
har *path)
{
return wc ("-l", path);
}
int
{
return wc ("-l", path);
}
int
-do_wc_w (char *path)
+do_wc_w (c
onst c
har *path)
{
return wc ("-w", path);
}
int
{
return wc ("-w", path);
}
int
-do_wc_c (char *path)
+do_wc_c (c
onst c
har *path)
{
return wc ("-c", path);
}
{
return wc ("-c", path);
}