#include <sys/time.h>
#include <time.h>
#include <limits.h>
+#include <signal.h>
+#include <poll.h>
#include <libsmartcols.h>
#ifdef HAVE_LIBREADLINE
# define _FUNCTION_DEF
#endif
int pwipemode = WIPEMODE_AUTO;
+int device_is_used;
+int is_interactive;
+struct fdisk_table *original_layout;
+
static int wipemode = WIPEMODE_AUTO;
/*
static void fdiskprog_init_debug(void)
{
- __UL_INIT_DEBUG(fdisk, FDISKPROG_DEBUG_, 0, FDISK_DEBUG);
+ __UL_INIT_DEBUG_FROM_ENV(fdisk, FDISKPROG_DEBUG_, 0, FDISK_DEBUG);
}
-#ifdef HAVE_LIBREADLINE
-static char *rl_fgets(char *s, int n, FILE *stream, const char *prompt)
+static void reply_sighandler(int sig __attribute__((unused)))
{
- char *p;
+ DBG(ASK, ul_debug("got signal"));
+}
- rl_outstream = stream;
- p = readline(prompt);
- if (!p)
- return NULL;
+static int reply_running;
- strncpy(s, p, n);
- s[n - 1] = '\0';
- free(p);
- return s;
+#ifdef HAVE_LIBREADLINE
+static char *reply_line;
+
+static void reply_linehandler(char *line)
+{
+ reply_line = line;
+ reply_running = 0;
+ rl_callback_handler_remove(); /* avoid duplicate prompt */
}
#endif
-int get_user_reply(struct fdisk_context *cxt, const char *prompt,
- char *buf, size_t bufsz)
+int get_user_reply(const char *prompt, char *buf, size_t bufsz)
{
- char *p;
+ struct sigaction oldact, act = {
+ .sa_handler = reply_sighandler
+ };
+ struct pollfd fds[] = {
+ { .fd = fileno(stdin), .events = POLLIN }
+ };
size_t sz;
+ int ret = 0;
+
+ DBG(ASK, ul_debug("asking for user reply %s", is_interactive ? "[interactive]" : ""));
+ sigemptyset(&act.sa_mask);
+ sigaction(SIGINT, &act, &oldact);
+
+#ifdef HAVE_LIBREADLINE
+ if (is_interactive)
+ rl_callback_handler_install(prompt, reply_linehandler);
+#endif
+ errno = 0;
+ reply_running = 1;
do {
+ int rc;
+
+ *buf = '\0';
#ifdef HAVE_LIBREADLINE
- if (isatty(STDIN_FILENO)) {
- if (!rl_fgets(buf, bufsz, stdout, prompt)) {
- if (fdisk_label_is_changed(fdisk_get_label(cxt, NULL))) {
- if (rl_fgets(buf, bufsz, stderr,
- _("\nDo you really want to quit? "))
- && !rpmatch(buf))
- continue;
- }
- fdisk_unref_context(cxt);
- exit(EXIT_FAILURE);
- } else
- break;
- }
- else
+ if (!is_interactive)
#endif
{
fputs(prompt, stdout);
fflush(stdout);
- if (!fgets(buf, bufsz, stdin)) {
- if (fdisk_label_is_changed(fdisk_get_label(cxt, NULL))) {
- fprintf(stderr, _("\nDo you really want to quit? "));
-
- if (fgets(buf, bufsz, stdin) && !rpmatch(buf))
- continue;
- }
- fdisk_unref_context(cxt);
- exit(EXIT_FAILURE);
- } else
- break;
}
- } while (1);
- for (p = buf; *p && !isgraph(*p); p++); /* get first non-blank */
+ rc = poll(fds, 1, -1);
+ if (rc == -1 && errno == EINTR) { /* interrupted by signal */
+ DBG(ASK, ul_debug("cancel by CTRL+C"));
+ ret = -ECANCELED;
+ goto done;
+ }
+ if (rc == -1 && errno != EAGAIN) { /* error */
+ ret = -errno;
+ goto done;
+ }
+#ifdef HAVE_LIBREADLINE
+ if (is_interactive) {
+ /* read input and copy to buf[] */
+ rl_callback_read_char();
+ if (!reply_running && reply_line) {
+ sz = strlen(reply_line);
+ if (sz == 0)
+ buf[sz++] = '\n';
+ else
+ memcpy(buf, reply_line, min(sz, bufsz));
+ buf[min(sz, bufsz - 1)] = '\0';
+ free(reply_line);
+ reply_line = NULL;
+ }
+ } else
+#endif
+ {
+ if (!fgets(buf, bufsz, stdin))
+ *buf = '\0';
+ break;
+ }
+ } while (reply_running);
+
+ if (!*buf) {
+ DBG(ASK, ul_debug("cancel by CTRL+D"));
+ ret = -ECANCELED;
+ clearerr(stdin);
+ goto done;
+ }
- if (p > buf)
- memmove(buf, p, p - buf); /* remove blank space */
- sz = strlen(buf);
+ /*
+ * cleanup the reply
+ */
+ sz = ltrim_whitespace((unsigned char *) buf);
if (sz && *(buf + sz - 1) == '\n')
*(buf + sz - 1) = '\0';
- DBG(ASK, ul_debug("user's reply: >>>%s<<<", buf));
- return 0;
+done:
+#ifdef HAVE_LIBREADLINE
+ if (is_interactive)
+ rl_callback_handler_remove();
+#endif
+ sigaction(SIGINT, &oldact, NULL);
+ DBG(ASK, ul_debug("user's reply: >>>%s<<< [rc=%d]", buf, ret));
+ return ret;
}
static int ask_menu(struct fdisk_context *cxt, struct fdisk_ask *ask,
/* ask for key */
snprintf(prompt, sizeof(prompt), _("Select (default %c): "), dft);
- rc = get_user_reply(cxt, prompt, buf, bufsz);
+ rc = get_user_reply(prompt, buf, bufsz);
if (rc)
return rc;
if (!*buf) {
q, low, high);
do {
- int rc = get_user_reply(cxt, prompt, buf, bufsz);
- uint64_t num;
+ int rc = get_user_reply(prompt, buf, bufsz);
+ uint64_t num = 0;
if (rc)
return rc;
char sig = 0, *p;
int pwr = 0;
- int rc = get_user_reply(cxt, prompt, buf, bufsz);
+ int rc = get_user_reply(prompt, buf, bufsz);
if (rc)
return rc;
if (!*buf && dflt >= low && dflt <= high)
}
if (sig == '+')
num += base;
+ else if (sig == '-' && fdisk_ask_number_is_wrap_negative(ask))
+ num = high - num;
else if (sig == '-')
num = base - num;
void *data __attribute__((__unused__)))
{
int rc = 0;
- char buf[BUFSIZ];
+ char buf[BUFSIZ] = { '\0' };
assert(cxt);
assert(ask);
do {
int x;
fputs(fdisk_ask_get_query(ask), stdout);
- rc = get_user_reply(cxt, _(" [Y]es/[N]o: "), buf, sizeof(buf));
+ rc = get_user_reply(_(" [Y]es/[N]o: "), buf, sizeof(buf));
if (rc)
break;
x = rpmatch(buf);
char prmt[BUFSIZ];
snprintf(prmt, sizeof(prmt), "%s: ", fdisk_ask_get_query(ask));
fputc('\n', stdout);
- rc = get_user_reply(cxt, prmt, buf, sizeof(buf));
+ rc = get_user_reply(prmt, buf, sizeof(buf));
if (rc == 0)
fdisk_ask_string_set_result(ask, xstrdup(buf));
DBG(ASK, ul_debug("string ask: reply '%s' [rc=%d]", buf, rc));
return rc;
}
-static struct fdisk_parttype *ask_partition_type(struct fdisk_context *cxt)
+static struct fdisk_parttype *ask_partition_type(struct fdisk_context *cxt, int *canceled)
{
const char *q;
struct fdisk_label *lb;
if (!lb)
return NULL;
+ *canceled = 0;
q = fdisk_label_has_code_parttypes(lb) ?
- _("Partition type (type L to list all types): ") :
- _("Hex code (type L to list all codes): ");
+ _("Hex code (type L to list all codes): ") :
+ _("Partition type (type L to list all types): ");
do {
- char buf[256];
- int rc = get_user_reply(cxt, q, buf, sizeof(buf));
+ char buf[256] = { '\0' };
+ int rc = get_user_reply(q, buf, sizeof(buf));
- if (rc)
+ if (rc) {
+ if (rc == -ECANCELED)
+ *canceled = 1;
break;
+ }
if (buf[1] == '\0' && toupper(*buf) == 'L')
list_partition_types(cxt);
- else if (*buf)
- return fdisk_label_parse_parttype(lb, buf);
+ else if (*buf) {
+ struct fdisk_parttype *t = fdisk_label_parse_parttype(lb, buf);
+
+ if (!t)
+ fdisk_info(cxt, _("Failed to parse '%s' partition type."), buf);
+ return t;
+ }
} while (1);
return NULL;
struct fdisk_parttype *t = NULL;
struct fdisk_partition *pa = NULL;
const char *old = NULL;
+ int canceled = 0;
assert(cxt);
old = t ? fdisk_parttype_get_name(t) : _("Unknown");
do {
- t = ask_partition_type(cxt);
+ t = ask_partition_type(cxt, &canceled);
+ if (canceled)
+ break;
} while (!t);
- if (fdisk_set_partition_type(cxt, i, t) == 0)
+ if (canceled == 0 && t && fdisk_set_partition_type(cxt, i, t) == 0)
fdisk_info(cxt,
_("Changed type of partition '%s' to '%s'."),
old, t ? fdisk_parttype_get_name(t) : _("Unknown"));
goto clean_data;
if (!data || !*data)
continue;
- fdisk_info(cxt, _("%15s: %s"), fdisk_field_get_name(fd), data);
+ fdisk_info(cxt, "%15s: %s", fdisk_field_get_name(fd), data);
free(data);
}
fdisk_enable_wipe(cxt, dowipe);
if (dowipe)
fdisk_warnx(cxt, _(
- "The old %s signature will be removed by a write command."),
+ "The device contains '%s' signature and it will be removed by a write command. "
+ "See fdisk(8) man page and --wipe option for more details."),
fdisk_get_collision(cxt));
else
fdisk_warnx(cxt, _(
- "The old %s signature may remain on the device. "
+ "The device contains '%s' signature and it may remain on the device. "
"It is recommended to wipe the device with wipefs(8) or "
"fdisk --wipe, in order to avoid possible collisions."),
fdisk_get_collision(cxt));
}
-static void __attribute__ ((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(void)
{
+ FILE *out = stdout;
+
fputs(USAGE_HEADER, out);
fprintf(out,
fputs(_(" -b, --sector-size <size> physical and logical sector size\n"), out);
fputs(_(" -B, --protect-boot don't erase bootbits when creating a new label\n"), out);
fputs(_(" -c, --compatibility[=<mode>] mode is 'dos' or 'nondos' (default)\n"), out);
- fputs(_(" -L, --color[=<when>] colorize output (auto, always or never)\n"), out);
+ fprintf(out,
+ _(" -L, --color[=<when>] colorize output (%s, %s or %s)\n"), "auto", "always", "never");
fprintf(out,
" %s\n", USAGE_COLORS_DEFAULT);
fputs(_(" -l, --list display partitions and exit\n"), out);
fputs(_(" -u, --units[=<unit>] display units: 'cylinders' or 'sectors' (default)\n"), out);
fputs(_(" -s, --getsz display device size in 512-byte sectors [DEPRECATED]\n"), out);
fputs(_(" --bytes print SIZE in bytes rather than in human readable format\n"), out);
- fputs(_(" -w, --wipe <mode> wipe signatures (auto, always or never)\n"), out);
- fputs(_(" -W, --wipe-partitions <mode> wipe signatures from new partitions (auto, always or never)\n"), out);
+ fprintf(out,
+ _(" -w, --wipe <mode> wipe signatures (%s, %s or %s)\n"), "auto", "always", "never");
+ fprintf(out,
+ _(" -W, --wipe-partitions <mode> wipe signatures from new partitions (%s, %s or %s)\n"), "auto", "always", "never");
fputs(USAGE_SEPARATOR, out);
fputs(_(" -C, --cylinders <number> specify the number of cylinders\n"), out);
fputs(_(" -S, --sectors <number> specify the number of sectors per track\n"), out);
fputs(USAGE_SEPARATOR, out);
- fputs(USAGE_HELP, out);
- fputs(USAGE_VERSION, out);
+ printf(USAGE_HELP_OPTIONS(31));
list_available_columns(out);
- fprintf(out, USAGE_MAN_TAIL("fdisk(8)"));
- exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+ printf(USAGE_MAN_TAIL("fdisk(8)"));
+ exit(EXIT_SUCCESS);
}
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- atexit(close_stdout);
+ close_stdout_atexit();
fdisk_init_debug(0);
scols_init_debug(0);
size_t sz = strtou32_or_err(optarg,
_("invalid sector size argument"));
if (sz != 512 && sz != 1024 && sz != 2048 && sz != 4096)
- usage(stderr);
+ errx(EXIT_FAILURE, _("invalid sector size argument"));
fdisk_save_user_sector_size(cxt, sz, sz);
break;
}
fdisk_dos_enable_compatible(lb, TRUE);
else if (strcmp(p, "nondos") == 0)
fdisk_dos_enable_compatible(lb, FALSE);
- else {
- warnx(_("unknown compatibility mode '%s'"), p);
- usage(stderr);
- }
+ else
+ errx(EXIT_FAILURE, _("unknown compatibility mode '%s'"), p);
}
/* use default if no optarg specified */
break;
if (optarg && *optarg == '=')
optarg++;
if (fdisk_set_unit(cxt, optarg) != 0)
- usage(stderr);
+ errx(EXIT_FAILURE, _("unsupported unit"));
break;
case 'V': /* preferred for util-linux */
case 'v': /* for backward compatibility only */
- printf(UTIL_LINUX_VERSION);
- return EXIT_SUCCESS;
+ print_version(EXIT_SUCCESS);
case 'w':
wipemode = wipemode_from_string(optarg);
if (wipemode < 0)
errx(EXIT_FAILURE, _("unsupported wipe mode"));
break;
case 'h':
- usage(stdout);
+ usage();
case OPT_BYTES:
fdisk_set_size_unit(cxt, FDISK_SIZEUNIT_BYTES);
break;
" be used with one specified device only."));
colors_init(colormode, "fdisk");
+ is_interactive = isatty(STDIN_FILENO);
switch (act) {
case ACT_LIST:
case ACT_SHOWSIZE:
/* deprecated */
- if (argc - optind <= 0)
- usage(stderr);
-
+ if (argc - optind <= 0) {
+ warnx(_("bad usage"));
+ errtryhelp(EXIT_FAILURE);
+ }
for (i = optind; i < argc; i++) {
uintmax_t blks = get_dev_blocks(argv[i]);
break;
case ACT_FDISK:
- if (argc-optind != 1)
- usage(stderr);
+ if (argc-optind != 1) {
+ warnx(_("bad usage"));
+ errtryhelp(EXIT_FAILURE);
+ }
/* Here starts interactive mode, use fdisk_{warn,info,..} functions */
color_scheme_enable("welcome", UL_COLOR_GREEN);
init_fields(cxt, outarg, NULL); /* -o <columns> */
+ if (!fdisk_is_readonly(cxt)) {
+ fdisk_get_partitions(cxt, &original_layout);
+ device_is_used = fdisk_device_is_used(cxt);
+ }
+
while (1)
process_fdisk_menu(&cxt);
}
projects / thirdparty / util-linux.git / blobdiff