WebSVN – DevTools – Diff – //binflow/trunk/src/binflow.c

 int debug_level = 0;
 int mustAbort = 0;
+int exitCode = 0;
 typedef struct
+{
    int cmdLineNumber;
    fpos_t filepos;
 } stack_t;
       ERROR("Bad/missing count/value in NTEXT command");
+   }
+}
+void fn_ZTEXT(char * arg_ptr)
+{
+   char * initial_arg_ptr = arg_ptr;
+   unsigned long value;
+   int got_a_value;
+   arg_ptr = next_value(arg_ptr, &value, &got_a_value);
+   if (got_a_value)
+   {
+      if ( value <= 1 )
+      {
+         ERROR("ZTEXT length too short");
+      }
+      arg_ptr++;  /* skip past ',' character */
+      if (*arg_ptr != 0)
+      {
+         DEBUG( DEBUG_OUTPUT_CMD_MASK, "ZTEXT %s", initial_arg_ptr );
+         /* feed text to output */
+         while ( (*arg_ptr != 0) && (value > 1) )
+         {
+            fputc(*arg_ptr++, op_stream);
+            value--;
+         }
+         /* Pad output with 0's if necessary */
+         while ( value > 0)
+         {
+            fputc(0, op_stream);
+            value--;
+         }
+      }
+      else
+      {
+         ERROR("Missing text from ZTEXT command");
+      }
+   }
+   else
+   {
+      ERROR("Bad/missing count/value in ZTEXT command");
+   }
+}
 /**************************************************************************/
 void fn_FEED(char * arg_ptr)
+{
    unsigned long count, i;
             else if (strnicmp(cmd_line, "NTEXT", 5) == 0) {
                strip_trailing_comment( cmd_line );
                if (OutputFileOpen())
                   fn_NTEXT(cmd_args);
+            }
+            else if (strnicmp(cmd_line, "ZTEXT", 5) == 0) {
+               strip_trailing_comment( cmd_line );
+               if (OutputFileOpen())
+                  fn_ZTEXT(cmd_args);
+            }
             else if (strnicmp(cmd_line, "ALIGN", 5) == 0) {
                strip_trailing_comment_and_spaces( cmd_line );
                if (OutputFileOpen())
                   fn_ALIGNMENT(cmd_args, 2);
+            }
                   printf("ERROR on line %u of command file\n\n", cmdLineNum);
                   printf("  %s\n", cmd_line);
                   printf("  ^\n");
                   printf("  |\n");
                   printf("  | Unknown Command\n");
+                  mustAbort = 1;
                   break;
+               }
+            }
+         }
    printf("  DW v,v,..,v            Add the specified list of 16-bit values to the output file\n");
    printf("  DL v,v,..,v            Add the specified list of 32-bit values to the output file\n");
    printf("  TEXT text              Add the specified text to the output file\n");
    printf("  NTEXT v,text           Add exactly v characters of the specified text to the output file\n");
    printf("                           - pad output file with 0's if insufficient text provided\n");
+   printf("  ZTEXT v,text           Add exactly v-1 characters and a NULL terminator of the specified text to the output file\n");
    printf("  BIG_ENDIAN             Turn Big-endian on (default behaviour)\n");
    printf("  LITTLE_ENDIAN          Turn Big-endian off\n");
    printf("  OUTPUT_FILE name       Opens a new Output File, closing the previous one\n");
    printf("  SEEKSTART offset       Seeks to the specified offset from the start of the output file\n");
    printf("  SEEKEND offset         Seeks to the specified offset from the end of the output file\n");
    newline();
+}
-void main( int argc,        /* Number of strings in array argv          */
+int main( int argc,        /* Number of strings in array argv          */
           char *argv[],    /* Array of command-line argument strings   */
           char **envp )    /* Array of environment variable strings    */
+{
    char * pCmdFilename = NULL;
    char * pOutputFilename = NULL;
+   {
       if( (op_stream = fopen( pOutputFilename, "wb" )) == NULL )
+      {
          fclose(cmd_stream);
          printf("ERROR : Could not open output file\n");
+         mustAbort = 1;
          goto binflow_exit;
+      }
       else
+      {
          i_op_file_opened = TRUE;
    if (i_ip_file_opened)
       fclose(ip_stream);
    if (i_had_input_stream_errors)
+   {
       printf("ERROR : Errors occurred when reading your input data file\n");
+      mustAbort = 1;
+   }
+   if (mustAbort)
+   {
+        exitCode = 1;
+        if ( pOutputFilename )
+            unlink (pOutputFilename);
+   }
+   return exitCode;
 binflow_exit:
+   exitCode = 2;
    if (showUsage)
+   {
       usage();
+   }
    else if (showCommands)
+   {
       commands();
+   }
+   return exitCode;
+}
 /************************************************************************************************************/

Subversion Repositories DevTools

(root)//binflow/trunk/src/binflow.c – Rev 1024 → 1026