Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
fdisks/sfdisk.c | 75 +++++++++++++++++++++++----------------------------------
1 file changed, 30 insertions(+), 45 deletions(-)
diff --git a/fdisks/sfdisk.c b/fdisks/sfdisk.c
index e639dad..f64f3cd 100644
--- a/fdisks/sfdisk.c
+++ b/fdisks/sfdisk.c
@@ -27,8 +27,6 @@
* I changed the name to sfdisk to prevent confusion. - aeb, 970501
*/
-#define PROGNAME "sfdisk"
-
#include <stdio.h>
#include <stdlib.h> /* atoi, free */
#include <stdarg.h> /* varargs */
@@ -108,18 +106,6 @@ my_warn(char *s, ...) {
va_end(p);
}
-static void
-error(char *s, ...) {
- va_list p;
-
- va_start(p, s);
- fflush(stdout);
- fprintf(stderr, "\n" PROGNAME ": ");
- vfprintf(stderr, s, p);
- fflush(stderr);
- va_end(p);
-}
-
/*
* A. About seeking
*/
@@ -137,12 +123,12 @@ sseek(char *dev, int fd, unsigned long s) {
if ((out = lseek(fd, in, SEEK_SET)) != in) {
perror("lseek");
- error(_("seek error on %s - cannot seek to %lu\n"), dev, s);
+ warnx(_("seek error on %s - cannot seek to %lu"), dev, s);
return 0;
}
if (in != out) {
- error(_("seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"),
+ warnx(_("seek error: wanted 0x%08x%08x, got 0x%08x%08x"),
(unsigned int)(in >> 32), (unsigned int)(in & 0xffffffff),
(unsigned int)(out >> 32), (unsigned int)(out & 0xffffffff));
return 0;
@@ -192,7 +178,7 @@ get_sector(char *dev, int fd, unsigned long long sno) {
if (read(fd, s->data, sizeof(s->data)) != sizeof(s->data)) {
if (errno) /* 0 in case we read past end-of-disk */
perror("read");
- error(_("read error on %s - cannot read sector %lu\n"), dev, sno);
+ warnx(_("read error on %s - cannot read sector %llu"), dev, sno);
free(s);
return 0;
}
@@ -223,7 +209,7 @@ write_sectors(char *dev, int fd) {
return 0;
if (write(fd, s->data, sizeof(s->data)) != sizeof(s->data)) {
perror("write");
- error(_("write error on %s - cannot write sector %lu\n"),
+ warnx(_("write error on %s - cannot write sector %llu"),
dev, s->sectornumber);
return 0;
}
@@ -261,7 +247,7 @@ save_sectors(char *dev, int fdin) {
fdout = open(save_sector_file, O_WRONLY | O_CREAT, 0444);
if (fdout < 0) {
perror(save_sector_file);
- error(_("cannot open partition sector save file (%s)\n"),
+ warnx(_("cannot open partition sector save file (%s)"),
save_sector_file);
goto err;
}
@@ -273,13 +259,13 @@ save_sectors(char *dev, int fdin) {
goto err;
if (read(fdin, ss + 4, 512) != 512) {
perror("read");
- error(_("read error on %s - cannot read sector %lu\n"),
+ warnx(_("read error on %s - cannot read sector %llu"),
dev, s->sectornumber);
goto err;
}
if (write(fdout, ss, sizeof(ss)) != sizeof(ss)) {
perror("write");
- error(_("write error on %s\n"), save_sector_file);
+ warnx(_("write error on %s"), save_sector_file);
goto err;
}
}
@@ -309,12 +295,12 @@ restore_sectors(char *dev) {
if (stat(restore_sector_file, &statbuf) < 0) {
perror(restore_sector_file);
- error(_("cannot stat partition restore file (%s)\n"),
+ warnx(_("cannot stat partition restore file (%s)"),
restore_sector_file);
goto err;
}
if (statbuf.st_size % 516) {
- error(_("partition restore file has wrong size - not restoring\n"));
+ warnx(_("partition restore file has wrong size - not restoring"));
goto err;
}
@@ -324,20 +310,20 @@ restore_sectors(char *dev) {
fdin = open(restore_sector_file, O_RDONLY);
if (fdin < 0) {
perror(restore_sector_file);
- error(_("cannot open partition restore file (%s)\n"),
+ warnx(_("cannot open partition restore file (%s)"),
restore_sector_file);
goto err;
}
if (read(fdin, ss, statbuf.st_size) != statbuf.st_size) {
perror("read");
- error(_("error reading %s\n"), restore_sector_file);
+ warnx(_("error reading %s"), restore_sector_file);
goto err;
}
fdout = open(dev, O_WRONLY);
if (fdout < 0) {
perror(dev);
- error(_("cannot open device %s for writing\n"), dev);
+ warnx(_("cannot open device %s for writing"), dev);
goto err;
}
@@ -348,7 +334,7 @@ restore_sectors(char *dev) {
goto err;
if (write(fdout, ss + 4, 512) != 512) {
perror(dev);
- error(_("error writing sector %lu on %s\n"), sno, dev);
+ warnx(_("error writing sector %lu on %s"), sno, dev);
goto err;
}
ss += 516;
@@ -360,7 +346,7 @@ restore_sectors(char *dev) {
goto err;
close(fdin);
if (close_fd(fdout) != 0) {
- error(_("write failed: %s"), dev);
+ warnx(_("write failed: %s"), dev);
return 0;
}
return 1;
@@ -472,7 +458,7 @@ get_cylindersize(char *dev, int fd, int silent) {
"the entire disk. Using fdisk on it is probably meaningless.\n"
"[Use the --force option if you really want this]\n"),
R.start);
- exit(1);
+ exit(EXIT_FAILURE);
}
#if 0
if (R.heads && B.heads != R.heads)
@@ -1436,7 +1422,7 @@ extended_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z)
break;
if (!msdos_signature(s)) {
- error(_("ERROR: sector %lu does not have an msdos signature\n"),
+ warnx(_("ERROR: sector %llu does not have an msdos signature"),
s->sectornumber);
break;
}
@@ -1670,7 +1656,7 @@ write_partitions(char *dev, int fd, struct disk_desc *z) {
if (no_write) {
warnx(_("-n flag was given: Nothing changed\n"));
- exit(0);
+ exit(EXIT_SUCCESS);
}
for (p = partitions; p < partitions + pno; p++) {
@@ -1691,12 +1677,12 @@ write_partitions(char *dev, int fd, struct disk_desc *z) {
}
}
if (!write_sectors(dev, fd)) {
- error(_("Failed writing the partition on %s\n"), dev);
+ warnx(_("Failed writing the partition on %s"), dev);
return 0;
}
if (fsync(fd)) {
perror(dev);
- error(_("Failed writing the partition on %s\n"), dev);
+ warnx(_("Failed writing the partition on %s"), dev);
return 0;
}
return 1;
@@ -2447,8 +2433,8 @@ activate_usage(char *progn) {
printf(_("%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"),
progn);
printf(_("%s -An device activate partition n, inactivate the other ones\n"),
- PROGNAME);
- exit(1);
+ program_invocation_short_name);
+ exit(EXIT_FAILURE);
}
static void
@@ -2676,7 +2662,7 @@ main(int argc, char **argv) {
break;
case 'T':
list_types();
- exit(0);
+ return EXIT_SUCCESS;
case 'U':
unhidearg = optarg;
unhide = 1;
@@ -2751,7 +2737,7 @@ main(int argc, char **argv) {
if (opt_size)
printf(_("total: %llu blocks\n"), total_size);
- exit(exit_status);
+ return exit_status;
}
if (optind == argc) {
@@ -2775,16 +2761,16 @@ main(int argc, char **argv) {
do_list(argv[optind], 0);
optind++;
}
- exit(exit_status);
+ return exit_status;
}
if (activate) {
do_activate(argv + optind, argc - optind, activatearg);
- exit(exit_status);
+ return exit_status;
}
if (unhide) {
do_unhide(argv + optind, argc - optind, unhidearg);
- exit(exit_status);
+ return exit_status;
}
if (do_id) {
if ((do_id & PRINT_ID) != 0 && optind != argc - 2)
@@ -2795,7 +2781,7 @@ main(int argc, char **argv) {
errx(EXIT_FAILURE, _("usage: sfdisk --id device partition-number [Id]"));
do_change_id(argv[optind], argv[optind + 1],
(optind == argc - 2) ? 0 : argv[optind + 2]);
- exit(exit_status);
+ return exit_status;
}
if (optind != argc - 1)
@@ -2809,7 +2795,7 @@ main(int argc, char **argv) {
else
do_fdisk(dev);
- return 0;
+ return exit_status;
}
/*
@@ -3136,7 +3122,7 @@ do_reread(char *dev) {
fd = my_open(dev, 0, 0);
if (reread_ioctl(fd)) {
warnx(_("This disk is currently in use.\n"));
- exit(1);
+ exit(EXIT_FAILURE);
}
close(fd);
@@ -3172,7 +3158,7 @@ do_fdisk(char *dev) {
"Use the --no-reread flag to suppress this check.\n"));
if (!force) {
warnx(_("Use the --force flag to overrule all checks.\n"));
- exit(1);
+ exit(EXIT_FAILURE);
}
} else
my_warn(_("OK\n"));
@@ -3243,5 +3229,4 @@ do_fdisk(char *dev) {
"(See fdisk(8).)\n"));
sync(); /* superstition */
- exit(exit_status);
}
--
1.8.3
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
