DistRen Changeset - 9c7a6746bc2a · protofusion repositories

Changeset - 9c7a6746bc2a

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca@zserver2 - 16 years ago 2009-12-22 23:22:23

Cruddy menu options, needs editing

1 file changed with 22 insertions and 4 deletions:

src/client/distren.c

0 comments (0 inline, 0 general)

src/client/distren.c

➞

Show inline comments

@@ @@ -19,100 +19,118 @@ @@
 /* This code is meant to submit files to the distren server(s). Let's say server for now. And let's state file purpose in each file just so we don't get screwed up! */
 /* Ideas for php-side stuff:
+ *
  * PHP adds the users... has captcha and email confirmation wth a pseudo-random number that
  * the user must enter on the site. Apache should be running mod_peruser for safety, and I'm
  * thinking zserver2 for web serving for convenience...
  */
 #include <distren.h>
 #include <stdio.h> /* sprintf, printf */
 #include <stdlib.h> /* malloc, free */
 #include <unistd.h> /* getopt */
 #include <confuse.h>
 #include <string.h> // for strcat
 int main(int argc, char *argv[])
+{
+  int doLogin = 0;
   char *input;
   char *output;
   char *jobid;
   char *username;
   char *password;
   char curopt;
   distren_t distren;
   distren_job_t distren_job;
   input = NULL;
   output = NULL;
   while(-1 != (curopt = getopt(argc, argv, "i:o:h")))
+  while(-1 != (curopt = getopt(argc, argv, "i:o:u:p:h")))
+    {
       if(curopt == ':')
+	{
 	  fprintf(stderr, "-%c: is missing an argument\n", optopt);
 	  return 1;
+	}
       else if(curopt == '?')
+	{
 	  fprintf(stderr, "-%c: invalid option specified\n", optopt);
 	  return 1;
+	}
       else if(curopt == 'h')
+	{
 	  fprintf(stderr, "Usage: %s -i <inputfile> -o <outputfile>\n", argv[0]);
+	  fprintf(stderr, "Usage: %s -i <inputfile> -o <outputfile> [ -u <username> -p <password> ]\n", argv[0]);
 	  fprintf(stderr, "\t-i\tSpecifies the input file\n\
 \t-o\tSpecifies the output file\n\
 \t-h\tShows this help message\n");
 	  //  don't return here because options_init will have an overall
 	  //  options help page
+	}
       else if(curopt == 'u') {
         doLogin = 1;
         username = strdup(optarg);
+      }
       else if(curopt == 'p') {
         doLogin = 1;
         password = strdup(optarg);
+      }
       else if(curopt == 'i')
 	 //  TODO: is strdup good or bad? what about
 	 //  the idea that all libs should allow plugging different
 	 //  malloc/free implementations in?
 	input = strdup(optarg);
       else if(curopt == 'o')
 	output = strdup(optarg);
+    }
      // give this error after the general arguments parsing so that
      // the general help from options_init can have effect
   if(!username || !password){
     fprintf(stderr, "Username and password must be specified");
     return 1;
+  }
   if(doLogin == 1){
     fprintf(stderr, "Trying username and password on server...");
     return 0;
+  }
   if(!input
      || !output)
+    {
       fprintf(stderr, "Input and output files must be specified\n");
       return 1;
+    }
   fprintf(stderr, "reading from %s\nwriting to %s\n", input, output);
   if(distren_init_mf(&distren, &malloc, &free))
+    {
       fprintf(stderr, "error initializing distren handle\n");
       return 1;
+    }
   if(distren_submit_file(distren, &distren_job, input))
+    {
       fprintf(stderr, "error submitting file\n");
       return 1;
+    }
   if(distren_job_getid(distren_job, &jobid))
+    {
       fprintf(stderr, "error retrieving job id\n");

0 comments (0 inline, 0 general)