git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fish: In guestfish(1) turn command references into links.
[libguestfs.git]
/
daemon
/
sfdisk.c
diff --git
a/daemon/sfdisk.c
b/daemon/sfdisk.c
index
8a5a46b
..
20d7dc8
100644
(file)
--- a/
daemon/sfdisk.c
+++ b/
daemon/sfdisk.c
@@
-32,13
+32,13
@@
static int
sfdisk (const char *device, int n, int cyls, int heads, int sectors,
const char *extra_flag,
static int
sfdisk (const char *device, int n, int cyls, int heads, int sectors,
const char *extra_flag,
- char *
const* const
lines)
+ char *
const *
lines)
{
FILE *fp;
char buf[256];
int i;
{
FILE *fp;
char buf[256];
int i;
- strcpy (buf, "
/sbin/
sfdisk");
+ strcpy (buf, "sfdisk");
if (n > 0)
sprintf (buf + strlen (buf), " -N %d", n);
if (n > 0)
sprintf (buf + strlen (buf), " -N %d", n);
@@
-72,13
+72,13
@@
sfdisk (const char *device, int n, int cyls, int heads, int sectors,
fp = popen (buf, "w");
if (fp == NULL) {
fp = popen (buf, "w");
if (fp == NULL) {
- reply_with_perror (buf);
+ reply_with_perror (
"failed to open pipe: %s",
buf);
return -1;
}
for (i = 0; lines[i] != NULL; ++i) {
if (fprintf (fp, "%s\n", lines[i]) < 0) {
return -1;
}
for (i = 0; lines[i] != NULL; ++i) {
if (fprintf (fp, "%s\n", lines[i]) < 0) {
- reply_with_perror (buf);
+ reply_with_perror (
"failed to write to pipe: %s",
buf);
pclose (fp);
return -1;
}
pclose (fp);
return -1;
}
@@
-96,7
+96,7
@@
sfdisk (const char *device, int n, int cyls, int heads, int sectors,
int
do_sfdisk (const char *device, int cyls, int heads, int sectors,
int
do_sfdisk (const char *device, int cyls, int heads, int sectors,
- char **lines)
+ char *
const
*lines)
{
return sfdisk (device, 0, cyls, heads, sectors, NULL, lines);
}
{
return sfdisk (device, 0, cyls, heads, sectors, NULL, lines);
}
@@
-105,13
+105,13
@@
int
do_sfdisk_N (const char *device, int n, int cyls, int heads, int sectors,
const char *line)
{
do_sfdisk_N (const char *device, int n, int cyls, int heads, int sectors,
const char *line)
{
- c
onst char *
lines[2] = { line, NULL };
+ c
har const *const
lines[2] = { line, NULL };
- return sfdisk (device, n, cyls, heads, sectors, NULL, lines);
+ return sfdisk (device, n, cyls, heads, sectors, NULL,
(void *)
lines);
}
int
}
int
-do_sfdiskM (const char *device, char **lines)
+do_sfdiskM (const char *device, char *
const
*lines)
{
return sfdisk (device, 0, 0, 0, 0, "-uM", lines);
}
{
return sfdisk (device, 0, 0, 0, 0, "-uM", lines);
}
@@
-122,9
+122,9
@@
sfdisk_flag (const char *device, const char *flag)
char *out, *err;
int r;
char *out, *err;
int r;
- r = command (&out, &err, "
/sbin/
sfdisk", flag, device, NULL);
+ r = command (&out, &err, "sfdisk", flag, device, NULL);
if (r == -1) {
if (r == -1) {
- reply_with_error ("
sfdisk:
%s: %s", device, err);
+ reply_with_error ("%s: %s", device, err);
free (out);
free (err);
return NULL;
free (out);
free (err);
return NULL;