git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generated code for head/tail commands.
[libguestfs.git]
/
daemon
/
sfdisk.c
diff --git
a/daemon/sfdisk.c
b/daemon/sfdisk.c
index
9d7a220
..
95f04af
100644
(file)
--- a/
daemon/sfdisk.c
+++ b/
daemon/sfdisk.c
@@
-30,7
+30,7
@@
#include "actions.h"
static int
#include "actions.h"
static int
-sfdisk (c
onst c
har *device, int n, int cyls, int heads, int sectors,
+sfdisk (char *device, int n, int cyls, int heads, int sectors,
char * const* const lines)
{
FILE *fp;
char * const* const lines)
{
FILE *fp;
@@
-39,7
+39,7
@@
sfdisk (const char *device, int n, int cyls, int heads, int sectors,
IS_DEVICE (device, -1);
IS_DEVICE (device, -1);
- strcpy (buf, "/sbin/sfdisk
--no-reread
");
+ strcpy (buf, "/sbin/sfdisk");
if (n > 0)
sprintf (buf + strlen (buf), " -N %d", n);
if (cyls)
if (n > 0)
sprintf (buf + strlen (buf), " -N %d", n);
if (cyls)
@@
-51,6
+51,9
@@
sfdisk (const char *device, int n, int cyls, int heads, int sectors,
/* Safe because of IS_DEVICE above: */
sprintf (buf + strlen (buf), " %s", device);
/* Safe because of IS_DEVICE above: */
sprintf (buf + strlen (buf), " %s", device);
+ if (verbose)
+ printf ("%s\n", buf);
+
fp = popen (buf, "w");
if (fp == NULL) {
reply_with_perror (buf);
fp = popen (buf, "w");
if (fp == NULL) {
reply_with_perror (buf);
@@
-75,15
+78,15
@@
sfdisk (const char *device, int n, int cyls, int heads, int sectors,
}
int
}
int
-do_sfdisk (c
onst c
har *device, int cyls, int heads, int sectors,
- char *
const* const
lines)
+do_sfdisk (char *device, int cyls, int heads, int sectors,
+ char *
*
lines)
{
return sfdisk (device, 0, cyls, heads, sectors, lines);
}
int
{
return sfdisk (device, 0, cyls, heads, sectors, lines);
}
int
-do_sfdisk_N (c
onst c
har *device, int n, int cyls, int heads, int sectors,
- c
onst c
har *line)
+do_sfdisk_N (char *device, int n, int cyls, int heads, int sectors,
+ char *line)
{
const char *lines[2] = { line, NULL };
{
const char *lines[2] = { line, NULL };
@@
-91,7
+94,7
@@
do_sfdisk_N (const char *device, int n, int cyls, int heads, int sectors,
}
static char *
}
static char *
-sfdisk_flag (c
onst c
har *device, const char *flag)
+sfdisk_flag (char *device, const char *flag)
{
char *out, *err;
int r;
{
char *out, *err;
int r;
@@
-112,19
+115,19
@@
sfdisk_flag (const char *device, const char *flag)
}
char *
}
char *
-do_sfdisk_l (c
onst c
har *device)
+do_sfdisk_l (char *device)
{
return sfdisk_flag (device, "-l");
}
char *
{
return sfdisk_flag (device, "-l");
}
char *
-do_sfdisk_kernel_geometry (c
onst c
har *device)
+do_sfdisk_kernel_geometry (char *device)
{
return sfdisk_flag (device, "-g");
}
char *
{
return sfdisk_flag (device, "-g");
}
char *
-do_sfdisk_disk_geometry (c
onst c
har *device)
+do_sfdisk_disk_geometry (char *device)
{
return sfdisk_flag (device, "-G");
}
{
return sfdisk_flag (device, "-G");
}