# HG changeset patch
# User ethanzonca
# Date 2009-10-10 17:12:35
# Node ID f31a1535a11a284ad392b445a922000e96fecd87
# Parent  4424d3a525856514e51819da8883aa8ccdaab35b

Formatting fixes, and a few code fixes

diff --git a/src/server/slave.c b/src/server/slave.c
--- a/src/server/slave.c
+++ b/src/server/slave.c
@@ -18,7 +18,6 @@
 
  */
 
-// Provides DISTREN_REQUEST* which is in reality, DISTREN_SEND(signal) in the minds of your average joe
 #include "protocol.h"
 #include "options.h" // Confuse, etc.
 #include "slavefuncs.h" // Slave functions
@@ -28,11 +27,9 @@
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <sys/stat.h> /*< mkdir() */
+#include <sys/stat.h>
 #include <stdlib.h>
 
-int slavestatus = 0; // Ugh global vars
-
 int main(int argc, char *argv[])
 {
 
@@ -40,42 +37,44 @@ int counter;
 
 /* Parses arguments, skips if there are no args */
 for(counter=0; counter<argc; counter++){
-	if(strcmp(argv[counter], "-h") == 0) {
-		fprintf(stderr, "Usage: distrenslave [option] <username> <emailaddr>\nStarts a distren slave\n\t-h\tshow this help\n\t-c\tregisters a user with [username] and [emailaddr] \n");
-		return 2;
-	}
+  if(strcmp(argv[counter], "-h") == 0) {
+    fprintf(stderr, "Usage: distrenslave [option] <username> <emailaddr>\nStarts a distren slave\n\t-h\tshow this help\n\t-c\tregisters a user with [username] and [emailaddr] \n");
+    return 2;
+  }
 }
-	if(argc>1
-		&& (strcmp("-c", argv[1]) == 0))
-	{
-		char *username;
-		char *email;
+
+if(argc>1 && (strcmp("-c", argv[1]) == 0))
+  {
+    char *username;
+    char *email;
 
-		if(argc != 4)
-		{
-			fprintf(stderr, "I need more arguments!\n%d is not enough!\n Invoke 'distrenslave -c <username> <emailaddr> to register. \n Already registered? Edit your distrenslave.conf file!\n'", argc - 1);
-			return 234;
-		}
+    if(argc != 4)
+      {
+        fprintf(stderr, "I need more arguments!\n%d is not enough!\n Invoke 'distrenslave -c <username> <emailaddr> to register. \n Already registered? Edit your distrenslave.conf file!\n'", argc - 1);
+        return 234;
+      }
 
-		username = argv[2];
-		email = argv[3];
+    username = argv[2];
+    email = argv[3];
 
-		if(!strchr(email, '@'))
-		{
-			fprintf(stderr, "I want to see an '@' in your email address!\n%s may be good enough for you, but I need more!\n", email);
-			return 235;
-		}
-		if( register_user(username, email) == 1){
-		  // register_user generates a key, too */
-                  curlpost(SYSCONFDIR "/distren.id_rsa","http://protofusion.org/distren/keys");
-		  fprintf(stderr,"Registration successful. You may now invoke distrenslave with no arguments.\n");
-		  return 0;
-		}
-		else{
-			fprintf(stderr,"Please try again! :D\n");
-			return 0;
-		}
-	}
+    if(!strchr(email, '@'))
+      {
+        fprintf(stderr, "I want to see an '@' in your email address!\n%s may be good enough for you, but I need more!\n", email);
+        return 235;
+      }
+    if( register_user(username, email) == 1)
+      {
+        // register_user generates a key, too */
+        curlpost(SYSCONFDIR "/distren.id_rsa","http://protofusion.org/distren/keys");
+        fprintf(stderr,"Registration successful. You may now invoke distrenslave with no arguments.\n");
+        return 0;
+      }
+    else
+      {
+        fprintf(stderr,"Please try again! :D\n");
+        return 0;
+      }
+}
 /* End arg parser */
 
 /* Option getter: Creates vars to grab stuff from conf, uses the options include to grab this data */
@@ -96,22 +95,22 @@ options_init(argc,argv,&my_cfg, myopts, 
 software_updatecheck(); // Should be run every day-ish, if the slave is constantly running.
 
 /* Notifies the user if there is no username in the conf file */
-	if(username == NULL || strcmp(username, "!username") == 0 ){
-	  fprintf(stderr, "\nYou didn't register!\nPlease register or edit your config. (see -h)\nIf this error persists, check distrenslave.conf to ensure all items are filled.\n");
-	}
-	else if( username != NULL || strcmp(username,"!username") != 0 ){
-		// Logs ya in:
-		if(login_user(username) == 1){
-			fprintf(stderr,"You should now be logged into distren.\n");
-		}
-		else{
-			fprintf(stderr,"Login failed. I have no clue why. Sorry.\n");
-			return 0;
-		}
-	}
-	else{
-	  fprintf(stderr,"Something is terribly wrong!");
-	}
+if(username == NULL || strcmp(username, "!username") == 0 ){
+  fprintf(stderr, "\nYou didn't register!\nPlease register or edit your config. (see -h)\nIf this error persists, check distrenslave.conf to ensure all items are filled.\n");
+}
+else if( username != NULL || strcmp(username,"!username") != 0 ){
+  // Logs ya in:
+  if(login_user(username) == 1){
+    fprintf(stderr,"You should now be logged into distren.\n");
+  }
+  else{
+    fprintf(stderr,"Login failed. I have no clue why. Sorry.\n");
+    return 0;
+  }
+}
+else{
+  fprintf(stderr,"Something is terribly wrong!");
+}
 
 
 
@@ -144,94 +143,93 @@ if( 1 == 0)
 
 // If the slave is getting job info...
 if(gotframe ==1)
-  {
-    /* @TODO: Add remotio hooks */
-    // jobnum = remoteio_read(jobnum); // Set jobnum from remoteio (we could use info from struct, but we need this info to download the xmlfile)
-    jobnum = 0;
-    //framenum = remoteio_read(jobnum); // Set framenum from remoteio
-    framenum = 0;
-
-    char *tarcmd;
-    char *outdir;
-    char *jobdatapath;
+{
+  /* @TODO: Add remotio hooks */
+  // jobnum = remoteio_read(jobnum); // Set jobnum from remoteio (we could use info from struct, but we need this info to download the xmlfile)
+  jobnum = 0;
+  //framenum = remoteio_read(jobnum); // Set framenum from remoteio
+  framenum = 0;
 
-    fprintf(stderr, "Received %d in job %d, preparing to render...\n",framenum,jobnum);
+  char *tarcmd;
+  char *outdir;
+  char *jobdatapath;
 
-    /**
-       Variable Preparation
-       @todo find where to free() all of these
-    */
-    _distren_asprintf(&jobdatapath, "job%d", jobnum);
-    _distren_asprintf(&urltoTar, "http://protofusion.org/distren/stor/job%d/job%d.tar.gz",jobnum); // Prepares URL to download from
-    _distren_asprintf(&pathtoTar, "%s/stor/jobdata/job%d.tar.gz", datadir, jobnum); // Prepares destination to save to
-
-    _distren_asprintf(&pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile
-    _distren_asprintf(&urltoOutput, "http://protofusion.org/distren/stor/tmp/", jobdatapath ); // Prepares the URL where output is posted
-    _distren_asprintf(&pathtoXml, "%s/job%d/job%d.xml",datadir, jobnum ); // Prepares the path to the job's XML file
+  fprintf(stderr, "Received %d in job %d, preparing to render...\n",framenum,jobnum);
 
-      // Downloads the job tar if it isn't  present. @TODO: Delete old job data
-      struct stat buffer;
-      int fstatus = stat(pathtoJobfile, &buffer);
+  /**
+     Variable Preparation
+     @todo find where to free() all of these
+  */
+  _distren_asprintf(&jobdatapath, "job%d", jobnum);
+  _distren_asprintf(&urltoTar, "http://protofusion.org/distren/stor/job%d/job%d.tar.gz",jobnum); // Prepares URL to download from
+  _distren_asprintf(&pathtoTar, "%s/stor/jobdata/job%d.tar.gz", datadir, jobnum); // Prepares destination to save to
+  _distren_asprintf(&pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile
+  _distren_asprintf(&urltoOutput, "http://protofusion.org/distren/stor/tmp/", jobdatapath ); // Prepares the URL where output is posted
+  _distren_asprintf(&pathtoXml, "%s/job%d/job%d.xml",datadir, jobnum ); // Prepares the path to the job's XML file
 
-      // If stat'ing the jobfile shows that the jobfile doesn't exist, we'll download it.
-      if(fstatus == -1){
-              // Downloads the Tar @TODO: add progress bar
-              if( curlget(urltoTar, pathtoTar) == 0){
-                fprintf(stderr, "File downloaded without errors\n");
-              }
-              else{
-                fprintf(stderr, "Download tar from server failed. Either the server is down, or the job hosting system is screwed up.\nContact admin@protofusion.org and include this message.\nGoodbye. Better luck next time.\n");
-              }
-      }
-      else{
-        fprintf(stderr, "Using cached job file...\n");
-      }
+  // Downloads the job tar if it isn't  present. @TODO: Delete old job data
+  struct stat buffer;
+  int fstatus = stat(pathtoJobfile, &buffer);
 
-    _distren_asprintf(&outdir, "/tmp/distren/job%d", jobnum); /*< @todo free() */
-    mkdir("/tmp/distren", 0750); /* @TODO: Make this less *nix-specific */
-    mkdir(outdir, 0750);
-
-    _distren_asprintf(&tarcmd, "tar -xvf \"%s\" -C \"%s\"", pathtoTar, outdir); /* @TODO: Make this portable. Libtar or something? */
-    system(tarcmd);
-    free(tarcmd);
-
-    // Parses a job's XML file, puts data in the myjob struct
-    if(xml2distrenjob(&myjob, pathtoXml) == 0){
-      fprintf(stderr,"Well, the XML craziness may have worked. Maybe. \n");
-      distrenjob_free(&myjob); // Frees things up if it was successful. xml2distrenjob() really (usually) only fails if malloc'ing inside it fails
+  // If stat'ing the jobfile shows that the jobfile doesn't exist, we'll download it.
+  if(fstatus == -1){
+    // Downloads the Tar @TODO: add progress bar
+    if( curlget(urltoTar, pathtoTar) == 0){
+      fprintf(stderr, "File downloaded without errors\n");
     }
     else{
-      fprintf(stderr,"I think the XML craziness may have failed, so I'll terminate just for fun.\n");
-      return 1;
+      fprintf(stderr, "Download tar from server failed. Either the server is down, or the job hosting system is screwed up.\nContact admin@protofusion.org and include this message.\nGoodbye. Better luck next time.\n");
     }
+  }
+  else{
+    fprintf(stderr, "Using cached job file...\n");
+  }
+
+  _distren_asprintf(&outdir, "/tmp/distren/job%d", jobnum); /*< @todo free() */
+  mkdir("/tmp/distren", 0750); /* @TODO: Make this less *nix-specific */
+  mkdir(outdir, 0750);
 
-    /* Variable-fillers which require XML */
-    outputExt = myjob->output_format; /* @TODO: FIXME! */
-    _distren_asprintf(&pathtoOutput, "%s/job%d/output/job%d-frame%d.%s", datadir, jobnum, jobnum, framenum, outputExt ); // Prepares the path to the jobfile
+  _distren_asprintf(&tarcmd, "tar -xvf \"%s\" -C \"%s\"", pathtoTar, outdir); /* @TODO: Make this portable. Libtar or something? */
+  system(tarcmd);
+  free(tarcmd);
+
+  // Parses a job's XML file, puts data in the myjob struct
+  if(xml2distrenjob(&myjob, pathtoXml) == 0){
+    fprintf(stderr,"Well, the XML craziness may have worked. Maybe. \n");
+    distrenjob_free(&myjob); // Frees things up if it was successful. xml2distrenjob() really (usually) only fails if malloc'ing inside it fails
+  }
+  else{
+    fprintf(stderr,"I think the XML craziness may have failed, so I'll terminate just for fun.\n");
+    return 1;
+  }
+
+  /* Variable-fillers which require XML */
+  outputExt = myjob->output_format; /* @TODO: FIXME! */
+  _distren_asprintf(&pathtoOutput, "%s/job%d/output/job%d-frame%d.%s", datadir, jobnum, jobnum, framenum, outputExt ); // Prepares the path to the jobfile
 
 
-    /** Series of IF's for jobtype based on xml content */
-    if(1==1){
-     exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum, threads); // @TODO: This warning should be fixed :D
-    }
+  /** Series of IF's for jobtype based on xml content */
+  if(1==1){
+   exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum, threads); // @TODO: This warning should be fixed :D
+  }
 
-    // Consider placing the following in the exec_blender() function
-    while(busy == 1){
-      tell_the_server(DISTREN_REQUEST_PROGRESS);
-        fprintf(stderr, "Rendering frame %d in job %d...",framenum,jobnum);
-        sleep(5); // or not... this should be more event-driven, but should still give a heartbeat to the server
-      }
-    busy = 2;
-    // busy = 1; // @TODO: When done rendering, set this.
-     }
-    // When blender is finished, run this...
-      if(busy==2){
-        fprintf(stderr, "Finished frame %d in job %d, uploading...",framenum,jobnum);
-        curlpost(pathtoOutput, urltoOutput); // uploads (HTML POST) the output at outputpath to the server at outputurl
-        tell_the_server(DISTREN_REQUEST_DONEFRAME); // Tells the server that it's finished rendering this frame
-        busy=0;
-        // Slave now becomes idle, doesn't need to tell the server anything, ssh handles this.
-      }
+  // Consider placing the following in the exec_blender() function
+  while(busy == 1){
+    tell_the_server(DISTREN_REQUEST_PROGRESS);
+      fprintf(stderr, "Rendering frame %d in job %d...",framenum,jobnum);
+      sleep(5); // or not... this should be more event-driven, but should still give a heartbeat to the server
+  }
+  busy = 2;
+  // busy = 1; // @TODO: When done rendering, set this.
+  }
+  // When blender is finished, run this...
+  if(busy==2){
+    fprintf(stderr, "Finished frame %d in job %d, uploading...",framenum,jobnum);
+    curlpost(pathtoOutput, urltoOutput); // uploads (HTML POST) the output at outputpath to the server at outputurl
+    tell_the_server(DISTREN_REQUEST_DONEFRAME); // Tells the server that it's finished rendering this frame
+    busy=0;
+    // Slave now becomes idle, doesn't need to tell the server anything, ssh handles this.
+  }
 
   return 0;
 }