Martin Schulte <dtaus@ratinganwendung.de>: Corrected broken string handling

[infodrom/dtaus] / main.c

diff --git a/main.c b/main.c
index c024c8c..622644f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,6 +1,6 @@
 /*
-    main.c - Datentraegeraustausch mit einer Bank
-    Copyright (c) 1996  Martin Schulze <joey@orgatech.de>
+    main.c - Belegloser Datenträgeraustausch mit einer Bank
+    Copyright (c) 1996,8,2001-4  Martin Schulze <joey@infodrom.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -14,14 +14,25 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
 
     $Id$
  */
 
+static char version[] = "0.6";
+
 #include <stdio.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include "dtaus.h"
 
+char *dtaus   = "dtaus0.txt";
+char *control = "dtaus0.ctl";
+char *beleg   = "dtaus0.doc";
+char *check   = "dtaus0.sik";
+
 void help ()
 {
   printf ("dtaus - Belegloser Datenträgeraustausch mit einer Bank\n\n");
@@ -37,46 +48,38 @@ void help ()
 #define DTAUS   1
 #define CONTROL 2
 
-void main (int argc, char **argv)
+int main (int argc, char **argv)
 {
-  char *dtaus[60];
-  char *control[60];
-  char *beleg[60];
-  char *check[60];
   int action = 0;
   int i = 0;
-
-  strcpy ((char *)dtaus, "dtaus0.txt");
-  strcpy ((char *)control, "dtaus0.ctl");
-  strcpy ((char *)beleg, "dtaus0.doc");
-  strcpy ((char *)check, "dtaus0.sik");
+  struct stat sbuf;
 
   while (argc - i > 1) {
     i++;
     if ( !strcmp(argv[i], "-h") ) {
       help(); exit(0);
     } else if ( !strcmp(argv[i], "-v") ) {
-      printf ("dtaus version 0.2 - Copyright (c) 1997 by Martin Schulze <joey@infodrom.north.de>\n");
+      printf ("dtaus version %s - Copyright (c) 1997,8,2001 by Martin Schulze <joey@infodrom.org>\n", version);
       exit (0);
     } else if ( !strcmp(argv[i], "-d") ) {
       if (argc - i > 1) {
        i++;
-       strcpy ((char *)dtaus, argv[i]);
+       dtaus = argv[i];
       }
     } else if ( !strcmp(argv[i], "-c") ) {
       if (argc - i > 1) {
        i++;
-       strcpy ((char *)control, argv[i]);
+       control = argv[i];
       }
     } else if ( !strcmp(argv[i], "-b") ) {
       if (argc - i > 1) {
        i++;
-       strcpy ((char *)beleg, argv[i]);
+       beleg = argv[i];
       }
     } else if ( !strcmp(argv[i], "-o") ) {
       if (argc - i > 1) {
        i++;
-       strcpy ((char *)check, argv[i]);
+       check = argv[i];
       }
     } else if ( !strcmp(argv[i], "-dtaus") ) {
       action = DTAUS;
@@ -85,10 +88,19 @@ void main (int argc, char **argv)
     } 
   }
 
-  if (action == DTAUS)
-    control2dtaus ((char *)control, (char *)dtaus, (char *)beleg, (char *)check);
-  else if (action == CONTROL)
-    dtaus2control ((char *)dtaus, (char *)control);
-  else
+  if (action == DTAUS) {
+    if (!stat((char *)control, &sbuf)) {
+      if (control2dtaus ((char *)control, (char *)dtaus, (char *)beleg, (char *)check) == 0)
+       exit (1);
+    }
+    else exit (1);
+  } else if (action == CONTROL) {
+    if (!stat((char *)dtaus, &sbuf))
+      dtaus2control ((char *)dtaus, (char *)control);
+    else exit (1);
+  } else {
     printf ("Keine Routine angegeben (-dtaus bzw. -control vergessen).\n");
+    exit (1);
+  }
+  exit (0);
 }