minor refactoring and more strings for translations

Author: PerditionC

hdisk.c

@@ -430,7 +430,7 @@ void Set_Hard_Drive_Media_Parameters(int alignment)
   /* 0.91k - already tell the user what she has to expect size-wise */
   if (drive_statistics.bytes_per_sector == 512) {
     unsigned long roughsize;
-    char* sizeunit = catgets(catalog, 13, 2, "kbytes");
+    char const * sizeunit = catgets(catalog, 13, 2, "kbytes");
     roughsize = drive_statistics.sect_available_on_disk >> 1;
     if (roughsize > 9999) {
       roughsize += 512;

makefile

@@ -21,15 +21,15 @@ CFLAGS=-wx -0 -mc -fpc -zp1
 OBJS=createfs.obj floppy.obj hdisk.obj main.obj   &
      savefs.obj bcread.obj prf.obj userint.obj    &
      driveio.obj getopt.obj init.obj recordbc.obj &
-     uformat.obj kitten.obj
+     uformat.obj msghlpr.obj kitten.obj
 
 pack: format.exe .SYMBOLIC
   $(UPX) $(UPXFLAGS) $<
 
 format.exe: $(OBJS)
   $(CLINK) $(CFLAGS) $(LDFLAGS) $< $(LDLIBS) -fe=$@
 
-.c.obj:
+.c.obj: kitten.h
   $(CC) $(CFLAGS) $*.c
 
 # rm is built-in to wmake

nls/format.en

@@ -377,9 +377,37 @@
 22,31:TWEAK: %d Sectors per cylinder, Format gap length %d!\n
 22,32:Floppy controller reset failed (code %x) - DDPT rejected?\n
 22,33:-- press ENTER to format disk (ESCAPE to abort) --\n
-22,34:
-22,35:
-22,36:
-22,37:
-22,38:
-22,39:
+22,34:[doublestepping] 
+22,35:[configured type %hu] 
+22,36: 500 kbps (HD 1xx0k)\n
+22,37: 300 kbps (DD  360k)\n
+22,38: 250 kbps (DD  720k)\n
+22,39:1000 kbps (ED 2880k)\n
+
+# savefs.c
+23,0:Cannot write MIRROR MAP sector %lu - UNFORMAT spoiled!\n
+23,1:Not 512 bytes / sector. Cannot save UNFORMAT data.\n
+23,2:Not 1 or 2 FAT copies. Cannot save UNFORMAT data.\n
+23,3:WARNING: Number of reserved / boot sectors is %u, not 1.\n
+23,4:WARNING: Reserved sectors are %u but will be %u after format.\n
+23,5: Must be FAT32, not %s!\n
+23,6: NOT saving unformat info, not preserving bad cluster list.\n
+23,7:WARNING: FAT32 with FAT1x style extra Root Directory???\n
+23,8: Must be FAT32, not FAT1x!\n
+23,9: FAT32 Root Directory but FAT1x FAT!\n
+23,10: %s size but supposed to be FAT32!\n
+23,11: Implausible Root Directory, FAT or drive size! Bad boot sector?\n
+23,12: Big FAT for little data? Bad boot sector?\n
+23,13:Root Directory NOT in 1st cluster, NOT saving it!\n
+23,14: Drive looks unformatted, UNFORMAT information NOT saved.\n
+23,15:Number of reserved sectors differs: FOUND %lu / PLANNED %u.\n
+23,16:Number of FATs differs: FOUND %lu / PLANNED %hu\n
+
+# savefs.c unable to save filesystem properties error message
+# Use as many messages as needed, 1 message per max 79 column line
+# message numbers do not need to match up for messages for different languages
+# Each message should end with a newline \n
+# after every 23 messages user will be prompted to press a key to continue
+24,0:Filesystem properties will change, cannot preserve the\n
+24,1:(possibly empty) old bad cluster list. Use a surface scan\n
+24,2:tool or FORMAT /U if you want to update the bad cluster list.\n

old_tcc.mak

@@ -26,7 +26,7 @@ LDLIBS=
 RM=command /c del
 OBJS1=createfs.obj floppy.obj hdisk.obj main.obj savefs.obj bcread.obj prf.obj
 OBJS2=userint.obj driveio.obj getopt.obj init.obj recordbc.obj uformat.obj
-OBJS3=kitten.obj
+OBJS3=msghlpr.obj kitten.obj
 
 # build targets:
 
@@ -41,40 +41,40 @@ format.exe: $(OBJS1) $(OBJS2) $(OBJS3)
 # .c.obj:
 #	$(CC) $(CFLAGS) -c $*.c
 
-createfs.obj:
+createfs.obj: kitten.h
 	$(CC) $(CFLAGS) createfs.c
 
-floppy.obj:
+floppy.obj: kitten.h
 	$(CC) $(CFLAGS) floppy.c
 
-hdisk.obj:
+hdisk.obj: kitten.h
 	$(CC) $(CFLAGS) hdisk.c
 
 main.obj: kitten.h
 	$(CC) $(CFLAGS) main.c
 
-savefs.obj:
+savefs.obj: kitten.h
 	$(CC) $(CFLAGS) savefs.c
 
 userint.obj: kitten.h
 	$(CC) $(CFLAGS) userint.c
 
-driveio.obj:
+driveio.obj: kitten.h
 	$(CC) $(CFLAGS) driveio.c
 
 getopt.obj:
 	$(CC) $(CFLAGS) getopt.c
 
-init.obj:
+init.obj: kitten.h
 	$(CC) $(CFLAGS) init.c
 
-recordbc.obj:
+recordbc.obj: kitten.h
 	$(CC) $(CFLAGS) recordbc.c
 
-uformat.obj:
+uformat.obj: kitten.h
 	$(CC) $(CFLAGS) uformat.c
 
-bcread.obj:
+bcread.obj: kitten.h
 	$(CC) $(CFLAGS) bcread.c
 
 prf.obj:
@@ -83,6 +83,9 @@ prf.obj:
 kitten.obj: kitten.h
 	$(CC) $(CFLAGS) kitten.c
 
+msghlpr.obj: kitten.h
+	$(CC) $(CFLAGS) msghlpr.c
+
 
 # clean up:
 

savefs.c

@@ -15,6 +15,7 @@
 // Module Description:  Save File System Function
 */
 
+#include <string.h>	/* strncmp */
 
 #include "format.h"
 #include "floppy.h"
@@ -23,8 +24,8 @@
 #include "savefs.h"
 #include "hdisk.h"	/* Force_Drive_Recheck */
 #include "userint.h"	/* Display_Percentage_Formatted */
+#include "msghlpr.h"
 
-#include <string.h>	/* strncmp */
 
 
 
@@ -35,10 +36,19 @@ void MMapWrite(unsigned long mmapsec, unsigned long * mmapbuf)
   memcpy((void *)&sector_buffer[0], (void *)mmapbuf, 512);
   if (debug_prog==TRUE) printf(" [map %lu] ", mmapsec);
   if (Drive_IO(WRITE, mmapsec, -1) != 0)
-    printf("Cannot write MIRROR MAP sector %lu - UNFORMAT spoiled!\n",
+    printf(catgets(catalog, 23, 0, "Cannot write MIRROR MAP sector %lu - UNFORMAT spoiled!\n"),
       mmapsec);
 }
 
+/* detailed help screen messages */
+char const * const properties_not_preserved[] = {
+  "Filesystem properties will change, cannot preserve the\n",
+  "(possibly empty) old bad cluster list. Use a surface scan\n",
+  "tool or FORMAT /U if you want to update the bad cluster list.\n",
+  NULL
+};
+
+
 /* Save the old file system for possible recovery with unformat */
 /* Used for SafeFormat and MIRROR, as you might have guessed... */
 /* *** WARNING: This only works if (...) the root directory follows    *** */
@@ -113,29 +123,29 @@ void Save_File_System(int overwrite)
 
     if ( BSWord(0x0b) != 512 )
       {
-      printf("Not 512 bytes / sector. Cannot save UNFORMAT data.\n");
+      printf(catgets(catalog, 23, 1, "Not 512 bytes / sector. Cannot save UNFORMAT data.\n"));
       bad_boot_sector = TRUE;
       }
 
     number_of_fats = sector_buffer[0x10];
     if ( (number_of_fats < 1) || (number_of_fats > 2) )
       {
-      printf("Not 1 or 2 FAT copies. Cannot save UNFORMAT data.\n");
+      printf(catgets(catalog, 23, 2, "Not 1 or 2 FAT copies. Cannot save UNFORMAT data.\n"));
       bad_boot_sector = TRUE;
       }
 
     reserved_sectors = BSWord(0x0e);
     if ((param.fat_type != FAT32) && (reserved_sectors != 1))
       {
-        printf("WARNING: Number of reserved / boot sectors is %u, not 1.\n",
+        printf(catgets(catalog, 23, 3, "WARNING: Number of reserved / boot sectors is %u, not 1.\n"),
           reserved_sectors);
         if ((reserved_sectors < 1) || (reserved_sectors > 64))
           bad_boot_sector = TRUE;
       }
     if ((param.fat_type == FAT32) &&
         (reserved_sectors != parameter_block.bpb.reserved_sectors))
       {
-        printf("WARNING: Reserved sectors are %u but will be %u after format.\n",
+        printf(catgets(catalog, 23, 4, "WARNING: Reserved sectors are %u but will be %u after format.\n"),
           reserved_sectors, parameter_block.bpb.reserved_sectors);
         if ((reserved_sectors < 1) || (reserved_sectors > 64)) /* no ; */
           bad_boot_sector = TRUE;        
@@ -146,18 +156,18 @@ void Save_File_System(int overwrite)
            (BSWord(0x16) == 0) ) /* FAT1x size zero? */
          && (fat_type != FAT32))
       {
-        printf(" Must be FAT32, not %s!\n",
+        printf(catgets(catalog, 23, 5, " Must be FAT32, not %s!\n"),
           (fat_type == FAT12) ? "FAT12" : "FAT16");
         /* 0 root dir entries or FAT1x size in Save_File_System */
 
         nomirror_wimp: /* common bailout point avoids duplicated code (0.91p) */
 
-        printf(" NOT saving unformat info, not preserving bad cluster list.\n");
+        printf(catgets(catalog, 23, 6, " NOT saving unformat info, not preserving bad cluster list.\n"));
         return;
       }
     if ( (number_of_root_directory_entries != 0) && (fat_type == FAT32) )
       {
-        printf("WARNING: FAT32 with FAT1x style extra Root Directory???\n");
+        printf(catgets(catalog, 23, 7, "WARNING: FAT32 with FAT1x style extra Root Directory???\n"));
         goto nomirror_wimp;	/* 0.91p */
       }
 
@@ -172,20 +182,20 @@ void Save_File_System(int overwrite)
         sectors_per_fat = BSLong(0x24);
         if (fat_type != FAT32)
           {
-            printf(" Must be FAT32, not FAT1x!\n");
+            printf(catgets(catalog, 23, 8, " Must be FAT32, not FAT1x!\n"));
             goto nomirror_wimp;	/* 0.91p */
           }
       }
     else
       { /* FAT1x case: 16bit sectors per fat value nonzero */
         if (number_of_root_directory_entries == 0)
           {
-            printf(" FAT32 Root Directory but FAT1x FAT!\n");
+            printf(catgets(catalog, 23, 9, " FAT32 Root Directory but FAT1x FAT!\n"));
             goto nomirror_wimp;	/* 0.91p */
           }
         if (fat_type != ( (sectors_per_fat <= 12) ? FAT12 : FAT16 ))
           {
-            printf(" %s size but supposed to be FAT32!\n",
+            printf(catgets(catalog, 23, 10, " %s size but supposed to be FAT32!\n"),
               (sectors_per_fat <= 12) ? "FAT12" : "FAT16");
             goto nomirror_wimp;	/* 0.91p */
           }
@@ -203,13 +213,13 @@ void Save_File_System(int overwrite)
          (sectors_per_fat < 1) ||
          (number_of_logical_sectors_on_drive < 200) )
       { /* not plausible root directory or FAT or drive size */
-        printf(" Implausible Root Directory, FAT or drive size! Bad boot sector?\n");
+        printf(catgets(catalog, 23, 11, " Implausible Root Directory, FAT or drive size! Bad boot sector?\n"));
         bad_boot_sector = TRUE; /* -ea */
       } else {
         if ( ( 1 + sectors_per_fat + (number_of_root_directory_entries >> 4) +
           5 ) > ( number_of_logical_sectors_on_drive >> 1 ) ) /* estimate only */
           {
-          printf(" Big FAT for little data? Bad boot sector?\n");
+          printf(catgets(catalog, 23, 12, " Big FAT for little data? Bad boot sector?\n"));
           bad_boot_sector = TRUE;
           }
       } /* root directory an FAT and drive size was plausible */
@@ -236,7 +246,7 @@ void Save_File_System(int overwrite)
             }
 
           if (BSLong(0x2c) != 2)
-            printf("Root Directory NOT in 1st cluster, NOT saving it!\n");
+            printf(catgets(catalog, 23, 13, "Root Directory NOT in 1st cluster, NOT saving it!\n"));
           /* would have to change some code below to save it properly... */
         }
       else
@@ -261,7 +271,7 @@ void Save_File_System(int overwrite)
   /* If the boot sector is not any good, don't save the file system. */
   if (bad_boot_sector==TRUE)
     {
-    printf(" Drive looks unformatted, UNFORMAT information NOT saved.\n");
+    printf(catgets(catalog, 23, 14, " Drive looks unformatted, UNFORMAT information NOT saved.\n"));
     /* not preserving "existing" bad cluster list either, of course! */
     return;
     }
@@ -282,15 +292,13 @@ void Save_File_System(int overwrite)
   else
     {
       unsigned long scratch;
-      printf("Filesystem properties will change, cannot preserve the\n");
-      printf("(possibly empty) old bad cluster list. Use a surface scan\n");
-      printf("tool or FORMAT /U if you want to update the bad cluster list.\n");
+	  Print_Messages_With_Pauses(catalog, 24, properties_not_preserved);
 
       if (reserved_sectors != parameter_block.bpb.reserved_sectors)
-        printf("Number of reserved sectors differs: FOUND %lu / PLANNED %u.\n",
+        printf(catgets(catalog, 23, 15, "Number of reserved sectors differs: FOUND %lu / PLANNED %u.\n"),
           reserved_sectors, parameter_block.bpb.reserved_sectors);
       if (number_of_fats != parameter_block.bpb.number_of_fats)
-        printf("Number of FATs differs: FOUND %lu / PLANNED %hu\n",
+        printf(catgets(catalog, 23, 16, "Number of FATs differs: FOUND %lu / PLANNED %hu\n"),
           number_of_fats, parameter_block.bpb.number_of_fats);
       if (sectors_per_cluster != BPB_SECTORS_PER_CLUSTER(parameter_block.bpb))
         printf("Cluster size differs: FOUND %lu / PLANNED %hu (sectors)\n",

userint.c

@@ -25,6 +25,7 @@
 
 #include "format.h"
 #include "userint.h"
+#include "msghlpr.h"
 
 
 #define KEYGET_ECHO regs.h.ah = 0x07; /* Get keypress, upcase and echo */ \
@@ -476,51 +477,6 @@ void Display_Invalid_Combination()
 } /* Display_Invalid_Combination */
 
 
-void Key_For_Next_Page(void);
-
-void Key_For_Next_Page()
-{
-  if (!isatty(1))
-    return; /* redirected? then do not wait. */
-    /* interesting: redirection to MORESYS (>MORE$) still is a TTY   */
-    /* redirection to a file is not a TTY, so waiting is avoided :-) */
-
-  printf(catgets(catalog, 14, 1, "-- press enter to see the next page or ESC to abort  --"));
-
-  /* Get keypress */
-  regs.h.ah = 0x07;
-  intdos(&regs, &regs);
-  if (regs.h.al == 27)
-    {
-      printf(catgets(catalog, 14, 2, "\nAborted at user request.\n"));
-      Exit(3,13);
-    }
-
-  printf("\n\n");
-
-} /* Key_For_Next_Page */
-
-
-void Print_Messages_With_Pauses(nl_catd catalog, int setnum, char const * const messages[])
-{
-  int msgnum = 0;
-  int use_cats = (catgets(catalog, setnum, 0, NULL) != NULL);
-  char const * msg;
-  
-  for (msg=(use_cats)?catgets(catalog, setnum, msgnum, NULL):messages[msgnum]; 
-       msg != NULL; 
-       msgnum++, msg=(use_cats)?catgets(catalog, setnum, msgnum, NULL):messages[msgnum])
-  {
-    printf("%s", msg);
-	if (msgnum && !(msgnum % 22)) /* every 23rd line after initial line */
-    {
-      if (memcmp(msg, "\n", 2) != 0) printf("\n");  /* add blank unless just printed a blank line */
-      Key_For_Next_Page();
-    }
-  }
-} /* Print_Messages_With_Pauses */
-
-
 /* short help screen */
 char const * const short_help[] = {
 #if LEGACY_HELP /* with legacy stuff */