From: Francesco Cosoleto <cosoleto@gmail.com>
To: util-linux@vger.kernel.org
Cc: Francesco Cosoleto <cosoleto@gmail.com>
Subject: [PATCH 3/5] fdisk: move command prompt code to a separate function
Date: Fri, 11 Nov 2011 11:12:09 +0100 [thread overview]
Message-ID: <1321006331-7633-3-git-send-email-cosoleto@gmail.com> (raw)
In-Reply-To: <1321006331-7633-1-git-send-email-cosoleto@gmail.com>
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
---
fdisk/fdisk.c | 244 +++++++++++++++++++++++++++++----------------------------
1 files changed, 125 insertions(+), 119 deletions(-)
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 7d1bd19..2a0e09c 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -2946,7 +2946,131 @@ unknown_command(int c) {
printf(_("%c: unknown command\n"), c);
}
+static void command_prompt(void)
+{
+ int c, j;
+
+ fprintf(stderr, _("Welcome to fdisk (%s).\n\n"
+ "Changes will remain in memory only, until you decide to write them.\n"
+ "Be careful before using the write command.\n"), PACKAGE_STRING);
+ if (disklabel == OSF_LABEL) {
+ putchar('\n');
+ /* OSF label, and no DOS label */
+ printf(_("Detected an OSF/1 disklabel on %s, entering "
+ "disklabel mode.\n"),
+ disk_device);
+ bsd_command_prompt();
+ /* If we return we may want to make an empty DOS label? */
+ disklabel = DOS_LABEL;
+ }
+
+ while (1) {
+ putchar('\n');
+ c = tolower(read_char(_("Command (m for help): ")));
+ switch (c) {
+ case 'a':
+ if (disklabel == DOS_LABEL)
+ toggle_active(get_partition(1, partitions));
+ else if (disklabel == SUN_LABEL)
+ toggle_sunflags(get_partition(1, partitions),
+ SUN_FLAG_UNMNT);
+ else if (disklabel == SGI_LABEL)
+ sgi_set_bootpartition(
+ get_partition(1, partitions));
+ else
+ unknown_command(c);
+ break;
+ case 'b':
+ if (disklabel == SGI_LABEL) {
+ printf(_("\nThe current boot file is: %s\n"),
+ sgi_get_bootfile());
+ if (read_chars(_("Please enter the name of the "
+ "new boot file: ")) == '\n')
+ printf(_("Boot file unchanged\n"));
+ else
+ sgi_set_bootfile(line_ptr);
+ } else
+ bsd_command_prompt();
+ break;
+ case 'c':
+ if (disklabel == DOS_LABEL)
+ toggle_dos_compatibility_flag();
+ else if (disklabel == SUN_LABEL)
+ toggle_sunflags(get_partition(1, partitions),
+ SUN_FLAG_RONLY);
+ else if (disklabel == SGI_LABEL)
+ sgi_set_swappartition(
+ get_partition(1, partitions));
+ else
+ unknown_command(c);
+ break;
+ case 'd':
+ /* If sgi_label then don't use get_existing_partition,
+ let the user select a partition, since
+ get_existing_partition() only works for Linux-like
+ partition tables */
+ if (disklabel != SGI_LABEL) {
+ j = get_existing_partition(1, partitions);
+ } else {
+ j = get_partition(1, partitions);
+ }
+ if (j >= 0)
+ delete_partition(j);
+ break;
+ case 'i':
+ if (disklabel == SGI_LABEL)
+ create_sgiinfo();
+ else
+ unknown_command(c);
+ case 'l':
+ list_types(get_sys_types());
+ break;
+ case 'm':
+ menu();
+ break;
+ case 'n':
+ new_partition();
+ break;
+ case 'o':
+ create_doslabel();
+ break;
+ case 'p':
+ list_table(0);
+ break;
+ case 'q':
+ close(fd);
+ printf("\n");
+ exit(0);
+ case 's':
+ create_sunlabel();
+ break;
+ case 't':
+ change_sysid();
+ break;
+ case 'u':
+ change_units();
+ break;
+ case 'v':
+ verify();
+ break;
+ case 'w':
+ write_table(); /* does not return */
+ break;
+ case 'x':
+ if (disklabel == SGI_LABEL) {
+ fprintf(stderr,
+ _("\n\tSorry, no experts menu for SGI "
+ "partition tables available.\n\n"));
+ } else
+ expert_command_prompt();
+ break;
+ default:
+ unknown_command(c);
+ menu();
+ }
+ }
+}
int
main(int argc, char **argv) {
@@ -3080,125 +3204,7 @@ main(int argc, char **argv) {
gpt_warning(disk_device);
get_boot(fdisk);
- fprintf(stderr, _("Welcome to fdisk (%s).\n\n"
- "Changes will remain in memory only, until you decide to write them.\n"
- "Be careful before using the write command.\n"), PACKAGE_STRING);
+ command_prompt();
- if (disklabel == OSF_LABEL) {
- putchar('\n');
- /* OSF label, and no DOS label */
- printf(_("Detected an OSF/1 disklabel on %s, entering "
- "disklabel mode.\n"),
- disk_device);
- bsd_command_prompt();
- /* If we return we may want to make an empty DOS label? */
- disklabel = DOS_LABEL;
- }
-
- while (1) {
- putchar('\n');
- c = tolower(read_char(_("Command (m for help): ")));
- switch (c) {
- case 'a':
- if (disklabel == DOS_LABEL)
- toggle_active(get_partition(1, partitions));
- else if (disklabel == SUN_LABEL)
- toggle_sunflags(get_partition(1, partitions),
- SUN_FLAG_UNMNT);
- else if (disklabel == SGI_LABEL)
- sgi_set_bootpartition(
- get_partition(1, partitions));
- else
- unknown_command(c);
- break;
- case 'b':
- if (disklabel == SGI_LABEL) {
- printf(_("\nThe current boot file is: %s\n"),
- sgi_get_bootfile());
- if (read_chars(_("Please enter the name of the "
- "new boot file: ")) == '\n')
- printf(_("Boot file unchanged\n"));
- else
- sgi_set_bootfile(line_ptr);
- } else
- bsd_command_prompt();
- break;
- case 'c':
- if (disklabel == DOS_LABEL)
- toggle_dos_compatibility_flag();
- else if (disklabel == SUN_LABEL)
- toggle_sunflags(get_partition(1, partitions),
- SUN_FLAG_RONLY);
- else if (disklabel == SGI_LABEL)
- sgi_set_swappartition(
- get_partition(1, partitions));
- else
- unknown_command(c);
- break;
- case 'd':
- /* If sgi_label then don't use get_existing_partition,
- let the user select a partition, since
- get_existing_partition() only works for Linux-like
- partition tables */
- if (disklabel != SGI_LABEL) {
- j = get_existing_partition(1, partitions);
- } else {
- j = get_partition(1, partitions);
- }
- if (j >= 0)
- delete_partition(j);
- break;
- case 'i':
- if (disklabel == SGI_LABEL)
- create_sgiinfo();
- else
- unknown_command(c);
- case 'l':
- list_types(get_sys_types());
- break;
- case 'm':
- menu();
- break;
- case 'n':
- new_partition();
- break;
- case 'o':
- create_doslabel();
- break;
- case 'p':
- list_table(0);
- break;
- case 'q':
- close(fd);
- printf("\n");
- exit(0);
- case 's':
- create_sunlabel();
- break;
- case 't':
- change_sysid();
- break;
- case 'u':
- change_units();
- break;
- case 'v':
- verify();
- break;
- case 'w':
- write_table(); /* does not return */
- break;
- case 'x':
- if (disklabel == SGI_LABEL) {
- fprintf(stderr,
- _("\n\tSorry, no experts menu for SGI "
- "partition tables available.\n\n"));
- } else
- expert_command_prompt();
- break;
- default:
- unknown_command(c);
- menu();
- }
- }
return 0;
}
--
1.7.3.4
next prev parent reply other threads:[~2011-11-11 10:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 10:12 [PATCH 1/5] fdisk: print the welcome message when OSF/1 disklabel is detected Francesco Cosoleto
2011-11-11 10:12 ` [PATCH 2/5] fdisk: rename bselect, xselect functions Francesco Cosoleto
2011-11-11 10:12 ` Francesco Cosoleto [this message]
2011-11-11 10:12 ` [PATCH 4/5] fdisk: rewrite print menu system Francesco Cosoleto
2011-11-11 11:40 ` Karel Zak
2011-11-11 16:49 ` Francesco Cosoleto
2011-11-11 10:12 ` [PATCH 5/5] fdisk: enable expert menu with SGI label Francesco Cosoleto
2011-11-14 13:42 ` [PATCH 1/5] fdisk: print the welcome message when OSF/1 disklabel is detected Karel Zak
2011-11-14 16:03 ` Francesco Cosoleto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1321006331-7633-3-git-send-email-cosoleto@gmail.com \
--to=cosoleto@gmail.com \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).