--- orig/TODO
+++ mod/TODO
@@ -1,6 +1,5 @@
 - weed out discrepancies between Linux fdisk and this program
 - add readline support
-- "--help" command dumps core (may only occur without readline support)
 - print error message when a disk label that Linux fdisk doesn't support
   is encountered (?)
 


--- orig/src/fdisk.c
+++ mod/src/fdisk.c
@@ -534,6 +534,17 @@
 	}
 }
 
+void
+fdisk_help_msg ()
+{
+        fdisk_usage_msg();
+        printf ("\n%s\n", _("OPTIONs:"));
+        fdisk_print_options_help ();
+        printf ("\n%s\n", _("COMMANDs:"));
+        fdisk_print_commands_help (fdisk_main_menu_commands);
+        exit (0);
+}
+
 static int
 do_help(PedDisk** disk)
 {


--- orig/src/ui.c
+++ mod/src/ui.c
@@ -445,19 +445,6 @@
         printf (_(usage_msg));
 }
 
-void
-fdisk_help_msg ()
-{
-        fdisk_usage_msg();
-
-	printf ("\n%s\n", _("OPTIONs:"));
-	fdisk_print_options_help ();
-
-	printf ("\n%s\n", _("COMMANDs:"));
-	fdisk_print_commands_help ();
-	exit (0);
-}
-
 int
 fdisk_interactive_mode (PedDisk** disk, FdiskCommand* cmd_list[])
 {