DistRen Changeset - cb26ccfc122d · protofusion repositories

Changeset - cb26ccfc122d

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca (ethanzonca) - 15 years ago 2010-06-26 02:35:21
e@ethanzonca.com

Made conf replacing a bit cleaner

3 files changed with 24 insertions and 11 deletions:

etc/distrenslave.conf.in

src/server/simpleslave.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

etc/distrenslave.conf.in

➞

Show inline comments

 slave
+{
   username = "!username"
   password = "!password"
   datadir = "@LOCALSTATEDIR@/@PACKAGE@"
   server = "protofusion"
   hostname = "protofusion.org"

src/server/simpleslave.c

➞

Show inline comments

@@ @@ -63,8 +63,9 @@ int main(int argc, char *argv[]) @@
   char curopt;
   int runBenchmark = 0;
   int updateConf = 0;
   while(((char)-1) != (curopt = getopt(argc, argv, "u:rh")))
+  while(((char)-1) != (curopt = getopt(argc, argv, "u:p:rh")))
+     {
        if(curopt == ':')
+         {
@@ @@ -78,7 +79,7 @@ int main(int argc, char *argv[]) @@
+         }
        else if(curopt == 'h')
+         {
-           fprintf(stderr, "Usage: distrensimpleslave [option] \nStarts a distren slave\n\t-u\tset username (run after fresh install)\n\t-r\tRecalculate render power (benchmark)\n\t-h\tshow this help\n");
+           fprintf(stderr, "Usage: distrensimpleslave [option] \nStarts a distren slave\n\t-u\tset Slave ID/Username (run after fresh install)\n\t-p\tset Slave Passphrase (run after fresh install)\n\t-r\tRecalculate render power (benchmark)\n\t-h\tshow this help\n");
            return 2;
+         }
        else if(curopt == 'r')
@@ @@ -86,16 +87,27 @@ int main(int argc, char *argv[]) @@
            runBenchmark = 1;
            break;
+         }
        else if(curopt == 'u')
+       else if(curopt == 'u'){
          username = strdup(optarg);
          updateConf = 1;
+       }
        else if(curopt == 'p'){
          password = strdup(optarg);
          updateConf = 1;
+       }
+     }
 if(updateConf){
          if(DEBUG)
            fprintf(stderr, "Putting username \"%s\" in distrenslave.conf\n", username);
     fprintf(stderr, "Putting Slave ID \"%s\" and Slave Passphrase \"%s\" in distrenslave.conf\n", username, password);
   if(username != NULL)
     conf_replace("distrenslave.conf", "!username", username);
   if(password != NULL)
     conf_replace("distrenslave.conf", "!password", password);
          conf_replace("distrenslave.conf", "!username", username);
          fprintf(stderr, "Please invoke distrensimpleslave with no arguments to run with the username you just set\n");
   fprintf(stderr, "Please invoke distrensimpleslave with no arguments to run with the slave ID and/or passphrase you just set\n");
          return 0;
+     }
   /* Get conf data */
   options_init(argc, argv, &my_cfg, myopts, "slave", &commonopts);
@@ @@ -111,12 +123,12 @@ int main(int argc, char *argv[]) @@
+    }
   if(!username)
+    {
       fprintf(stderr, "username not set\n");
+      fprintf(stderr, "username not set, try the -u flag \n");
       return 1;
+    }
   if(!password)
+    {
       fprintf(stderr, "password not set\n");
+      fprintf(stderr, "password not set, try the -p flag\n");
       return 1;
+    }
   if(!hostname)
@@ @@ -131,7 +143,7 @@ int main(int argc, char *argv[]) @@
     return 1;
   if(!strncmp(password, "!password",10))
+    {
       fprintf(stderr, "You haven't specified a password. Please edit distrenslave.conf!\n");
+      fprintf(stderr, "You haven't specified a password. Please edit distrenslave.conf or try the -p flag!\n");
       return 1;
+    }

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -412,7 +412,7 @@ int checkUsername(char *username) @@
+{
   if(username == NULL || strcmp(username, "!username") == 0 )
+    {
      fprintf(stderr, "\nPlease ensure that your username is present in distrenslave.conf\n");
+     fprintf(stderr, "\nPlease ensure that your username is present in distrenslave.conf, or use the -u flag to set a username.\n");
      return 1;
+   }
    else

0 comments (0 inline, 0 general)