# HG changeset patch
# User Binki <ohnobinki@ohnopublishing.net>
# Date 2009-10-10 19:26:09
# Node ID e7e0e5775ace1d2d046ad106faff610a6b500188
# Parent  4b8e027a0b0cbc989240bc8420080099ea5dc475

reindent, reformat

diff --git a/src/server/slave.c b/src/server/slave.c
--- a/src/server/slave.c
+++ b/src/server/slave.c
@@ -16,11 +16,11 @@
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 
- */
+*/
 
 #include "protocol.h"
-#include "options.h" // Confuse, etc.
-#include "slavefuncs.h" // Slave functions
+#include "options.h" /* Confuse, etc. */
+#include "slavefuncs.h" /* Slave functions */
 #include "asprintf.h"
 #include "remoteio.h"
 
@@ -33,190 +33,194 @@
 int main(int argc, char *argv[])
 {
 
-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;
-  }
-}
+  int counter;
 
-if(argc>1 && (strcmp("-c", argv[1]) == 0))
-  {
-    char *username;
-    char *email;
-
-    if(argc != 4)
+  /* Parses arguments, skips if there are no args */
+  for(counter = 0; counter < argc; counter ++)
+    if(strcmp(argv[counter], "-h") == 0)
       {
-        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;
+	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;
       }
 
-    username = argv[2];
-    email = argv[3];
+  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;
+	}
+
+      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;
-      }
-}
-/* End arg parser */
+      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 */
-char *username;
-char *datadir;
-cfg_t * my_cfg;
-cfg_opt_t myopts[] = {
+  /* Option getter: Creates vars to grab stuff from conf, uses the options include to grab this data */
+  char *username;
+  char *datadir;
+  cfg_t * my_cfg;
+  cfg_opt_t myopts[] = {
     CFG_SIMPLE_STR("username", &username),
     CFG_SIMPLE_STR("datadir", &datadir),
     CFG_END()
   };
-struct options_common *commonopts;
+  struct options_common *commonopts;
 
-username = NULL;
-options_init(argc,argv,&my_cfg, myopts, "slave", &commonopts);
-/* End option getter */
+  username = NULL;
+  options_init(argc, argv, &my_cfg, myopts, "slave", &commonopts);
+  /* End option getter */
 
-software_updatecheck(datadir); // Should be run every day-ish, if the slave is constantly running.
+  /* Should _not_ be run every day-ish if the slave is constantly running. */
+  /* software_updatecheck(datadir); */
 
-/* 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!");
-}
+  /* 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!");
+      }
 
 
 
-/* Code-filled Variables  */
-int jobnum;          // The job number that we're currently working
-int framenum;        // @TODO: Remotio should fill this
+  /* Code-filled Variables  */
+  int jobnum;          /* The job number that we're currently working */
+  int framenum;        /* @TODO: Remotio should fill this */
 
-int gotframe = 0;        // set this to 1 after data for a job is received from the server
-int busy = 0;        // Client business 1=busy 0=idle
+  int gotframe = 0;    /* set this to 1 after data for a job is received from the server */
+  int busy = 0;        /* Client business 1=busy 0=idle */
 
-char *urltoTar;      // Full URL to the server-side location of job#.tgz
-char *pathtoTar;     // Full path to the location of the job#.tgz
+  char *urltoTar;      /* Full URL to the server-side location of job#.tgz */
+  char *pathtoTar;     /* Full path to the location of the job#.tgz */
 
-char *urltoOutput;   // Full URL where output is posted
-char *pathtoJobfile; // Full path to the job's main file
-char *pathtoXml;     // Full path to the job's xml file
-char *pathtoOutput;  // Full path to the output (rendered) file
-char *outputExt;     // Output Extension (e.g., JPG)
+  char *urltoOutput;   /* Full URL where output is posted */
+  char *pathtoJobfile; /* Full path to the job's main file */
+  char *pathtoXml;     /* Full path to the job's xml file */
+  char *pathtoOutput;  /* Full path to the output (rendered) file */
+  char *outputExt;     /* Output Extension (e.g., JPG) */
 
-char *tarcmd;        // Command to run for tar. Migrate to libtar sometime
-char *outdir;        // Output Directory for tar
-char *jobdatapath;   // Path to job data
+  char *tarcmd;        /* Command to run for tar. Migrate to libtar sometime */
+  char *outdir;        /* Output Directory for tar */
+  char *jobdatapath;   /* Path to job data */
 
-struct distrenjob *myjob; // Structure to hold data gathered from the XML file
+  struct distrenjob *myjob; /* Structure to hold data gathered from the XML file */
 
-/* If the server says that every frame for jobnum is finished */
-if( 1 == 0)
-  {
+  /* If the server says that every frame for jobnum is finished */
+  if(1 == 0)
     delete_jobdata(jobnum, datadir);
-  }
+  
+  /* 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;
 
-// 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;
-
-  fprintf(stderr, "Received %d in job %d, preparing to render...\n",framenum,jobnum);
+      fprintf(stderr, "Received %d in job %d, preparing to render...\n", framenum, jobnum);
 
-  /**
-     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
+      /**
+	 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
 
-  // Downloads the job tar if it isn't  present. @TODO: Delete old job data
-  struct stat buffer;
-  int fstatus = stat(pathtoJobfile, &buffer);
+      // Downloads the job tar if it isn't  present. @TODO: Delete old job data
+      struct stat buffer;
+      int fstatus = stat(pathtoJobfile, &buffer);
+
+      /* 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");
 
-  // 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");
-  }
+      _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(&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);
 
-  _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");
+	  
+	  /* Frees things up if it was successful. xml2distrenjob() really (usually) only fails if malloc'ing inside it fails */
+	  distrenjob_free(&myjob); 
+	}
+      else
+	{
+	  fprintf(stderr, "I think the XML craziness may have failed, so I'll terminate just for fun.\n");
+	  return 1;
+	}
 
-  // 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
+      /* Variable-fillers which require XML */
+      outputExt = myjob->output_format; /* @TODO: FIXME! <-- NEVER! */
+      /* Prepares the path to the jobfile */
+      _distren_asprintf(&pathtoOutput, "%s/job%d/output/job%d-frame%d.%s", datadir, jobnum, jobnum, framenum, outputExt );
 
 
-  /** Series of IF's for jobtype based on xml content */
-  if(1==1){
-   exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum); // @TODO: This warning should be fixed :D
-  }
-  // When blender is finished, run this...
-  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.
+      /** Series of ifs for jobtype based on xml content */
+      if(1 == 1)
+	exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum); /* @TODO: This warning should be fixed :D */
 
-}
+      /* When blender is finished, run this... */
+      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;