[Mixmaster-devel] r851 - branches/Mix-stats/Src

[<we...@so...>]

Author: weasel
Date: 2004-05-13 15:44:32 +0200 (Thu, 13 May 2004)
New Revision: 851

Modified:
   branches/Mix-stats/Src/main.c
Log:
Refix spacing in main.c

Modified: branches/Mix-stats/Src/main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/Mix-stats/Src/main.c	2004-05-13 10:49:58 UTC (rev 850)
+++ branches/Mix-stats/Src/main.c	2004-05-13 13:44:32 UTC (rev 851)
@@ -85,28 +85,27 @@
   }
 #endif /* USE_NCURSES */
   if (argc > 1 && strleft(argv[1], "-f")) {
-    menu_folder(strlen(argv[1]) > 2 ? argv[1][2] : 0,
-    argc < 3 ? NULL : argv[2]);
+    menu_folder(strlen(argv[1]) > 2 ? argv[1][2] : 0, argc < 3 ? NULL : =
argv[2]);
     goto clientpool;
   }
   for (i =3D 1; i < argc; i++) {
     p =3D argv[i];
     if (p[0] =3D=3D '-' && p[1] !=3D '\0') {
       if (p[1] =3D=3D '-') {
-        p +=3D 2;
-        if (strieq(p, "help"))
-          help =3D 1, deflt =3D 0;
-        else if (streq(p, "version"))
-          version =3D 1, deflt =3D 0;
-        else if (streq(p, "about"))
-          about =3D 1, deflt =3D 0;
-        else if (streq(p, "verbose"))
-          verbose =3D 1;
-        else if (streq(p, "type-list"))
-          type_list =3D 1;
-        else if (streq(p, "dummy"))
-          send =3D MSG_NULL, deflt =3D 0;
-        else if (streq(p, "remailer"))
+	p +=3D 2;
+	if (strieq(p, "help"))
+	  help =3D 1, deflt =3D 0;
+	else if (streq(p, "version"))
+	  version =3D 1, deflt =3D 0;
+	else if (streq(p, "about"))
+	  about =3D 1, deflt =3D 0;
+	else if (streq(p, "verbose"))
+	  verbose =3D 1;
+	else if (streq(p, "type-list"))
+	  type_list =3D 1;
+	else if (streq(p, "dummy"))
+	  send =3D MSG_NULL, deflt =3D 0;
+	else if (streq(p, "remailer"))
 	  maint =3D 1, deflt =3D 0;
 	else if (streq(p, "generate-key"))
 	  keygen =3D 2, deflt =3D 0;
@@ -147,31 +146,25 @@
 	  }
 	  if (statssrc->length > 0) {
 	    update_stats =3D 1;
-	  }
-	  else {
+	  } else {
 	    deflt =3D 0;
 	    fprintf(stderr, "%s: No current stats source --%s\n", argv[0], p);
 	  }
-	}
-	else if (strleft(p, "update-stats") && p[strlen("update-stats")] =3D=3D=
 '=3D') {
+	} else if (strleft(p, "update-stats") && p[strlen("update-stats")] =3D=3D=
 '=3D') {
 	  buf_clear(statssrc);
 	  buf_appendf(statssrc, "%s", (p + strlen("update-stats") + 1));
 	  if (statssrc->length > 0) {
 	    update_stats =3D 1;
-	  }
-	  else {
+	  } else {
 	    fprintf(stderr, "%s: No stats source specified --%s\n", argv[0], p)=
;
 	  }
-	}
-	else if ((q =3D largopt(p, "to", argv[0], &error)) !=3D NULL) {
+	} else if ((q =3D largopt(p, "to", argv[0], &error)) !=3D NULL) {
 	  header =3D 0;
 	  buf_appendf(msg, "To: %s\n", q);
-	}
-	else if ((q =3D largopt(p, "post-to", argv[0], &error)) !=3D NULL) {
+	} else if ((q =3D largopt(p, "post-to", argv[0], &error)) !=3D NULL) {
 	  send =3D MSG_POST, header =3D 0;
 	  buf_appendf(msg, "Newsgroups: %s\n", q);
-	}
-	else if ((q =3D largopt(p, "subject", argv[0], &error)) !=3D NULL) {
+	} else if ((q =3D largopt(p, "subject", argv[0], &error)) !=3D NULL) {
 	  buf_appendf(msg, "Subject: %s\n", q);
 	} else if ((q =3D largopt(p, "header", argv[0], &error)) !=3D NULL) {
 	  buf_appendf(msg, "%s\n", q);
@@ -251,9 +244,9 @@
 	  case 'T':
 	    type_list =3D 1;
 	    break;
-          case 'V':
-            version =3D 1, deflt =3D 0;
-            break;
+	  case 'V':
+	    version =3D 1, deflt =3D 0;
+	    break;
 	  case 't':
 	    if (*(p + 1) =3D=3D 'o')
 	      p++;
@@ -261,8 +254,7 @@
 	    if (i < argc - 1)
 	      buf_appendf(msg, "To: %s\n", argv[++i]);
 	    else {
-	      fprintf(stderr, "%s: Missing argument for option -to\n",
-		      argv[0]);
+	      fprintf(stderr, "%s: Missing argument for option -to\n", argv[0])=
;
 	      error =3D 1;
 	    }
 	    break;
@@ -380,8 +372,7 @@
     if (url_download(ALLPINGERSURL, pingpath) < 0) {
       printf("    Download failed... Try again later.\n");
       errlog(ERRORMSG, "All Pingers File Download failed.\n");
-    }
-    else {
+    } else {
       if (verbose) printf("    Done.\n");
       errlog(LOG, "All Pingers File Downloaded OK.\n");
     }
@@ -394,17 +385,16 @@
     read_allpingers(inifile);
     if (good_stats_source(inifile, statssrc->data) =3D=3D 1) {
       if (stats_download(inifile, statssrc->data, 0) =3D=3D 0) {
-        f =3D mix_openfile(STATSSRC, "w+");
-        if (f !=3D NULL) {
-          fprintf(f, "%s", statssrc->data);
-          fclose(f);
-        } else {
-          fprintf(stderr, "Could not open stats source file for writing\=
n");
+	f =3D mix_openfile(STATSSRC, "w+");
+	if (f !=3D NULL) {
+	  fprintf(f, "%s", statssrc->data);
+	  fclose(f);
+	} else {
+	  fprintf(stderr, "Could not open stats source file for writing\n");
 	  errlog(ERRORMSG, "Could not open stats source file for writing.\n");
 	}
       }
-    }
-    else {
+    } else {
       fprintf(stderr, "Stats source does not include all required files.=
\n");
       errlog(ERRORMSG, "Stats source does not include all required files=
.\n");
     }
@@ -713,7 +703,7 @@
   buf_free(nymopt);
   buf_free(pseudonym);
   buf_free(attachments);
-	buf_free(statssrc);
+  buf_free(statssrc);
=20
   if (daemon) {
     check_get_pass(1);
@@ -725,20 +715,20 @@
       /* Detach as suggested by the Unix Programming FAQ */
       pid =3D fork();
       if (pid > 0)
-        exit(0);
+	exit(0);
       if (setsid() < 0) {
-				/* This should never happen. */
-				fprintf(stderr, "setsid() failed.\n");
-				exit(1);
+	/* This should never happen. */
+	fprintf(stderr, "setsid() failed.\n");
+	exit(1);
       };
       pid =3D fork();
       if (pid > 0)
-				exit(0);
+	exit(0);
     };
     if (chdir(MIXDIR) < 0) {
       if (chdir("/") < 0) {
-				fprintf(stderr, "Cannot chdir to mixdir or /.\n");
-				exit(1);
+	fprintf(stderr, "Cannot chdir to mixdir or /.\n");
+	exit(1);
       };
     };
     if (write_pidfile(PIDFILE)) {