# HG changeset patch
# User normaldotcom <e@ethanzonca.com>
# Date 2010-06-26 01:30:23
# Node ID e8abe91d635f952fb296de65a353c923b2a5a68e
# Parent  0e43edb16f3ffb5d54d8ff4b5f1189b86db6cddb

Backported tar to standard slave

diff --git a/TODO b/TODO
--- a/TODO
+++ b/TODO
@@ -36,7 +36,6 @@ Master
 
 Slave
   B-UnpackJob() and supporting functions need to work
-  E-Restore tar functionality after unpackJob() is functional
   E-Add calls to remoteio, once it works or even before it works -> write message API functions and API
   =-Make code more flexible for different types of jobs and operating systems (such as paths, libs, etc)
   =-Add code to allow pausing/resuming of the slave (including a running blender process) -> signal handling (SIGTSTP vs. SIGSTOP), distrenslave_control cmdline interface
@@ -47,6 +46,8 @@ Slave
   x=Add lockout of slaves below a certain version
   x-Add simpleslave with code to work around nonexisting server codebase
   x-Backport SimpleSlave functionality to slave code
+  x-Restore tar functionality after unpackJob() is functional (6/26/10: unpackJob isn't functional, but tar re-implemented)
+
 
 
 Options
diff --git a/src/server/simpleslave.c b/src/server/simpleslave.c
--- a/src/server/simpleslave.c
+++ b/src/server/simpleslave.c
@@ -218,7 +218,7 @@ int main(int argc, char *argv[])
 
         // Check if tar exists already
         struct stat jbuffer;
-        int jstatus = stat(pathtoJobfile, &jbuffer);
+        int jstatus = stat(pathtoTar, &jbuffer);
         if(jstatus == -1){
           fprintf(stderr,"Main job file does not exist, extracting...\n");
 
diff --git a/src/server/slave.c b/src/server/slave.c
--- a/src/server/slave.c
+++ b/src/server/slave.c
@@ -163,8 +163,7 @@ int main(int argc, char *argv[])
   char *pathtoOutdir;  /* Full path to output directory */
   char *pathtoRenderOutput;  /* Contains blender framenum placeholder */
 
-  // Temporary for uncomressed testing @TODO: remove
-  char *urltoJobfile;
+  char *urltoJobfile; /* No longer used, url to .blend on server */
 
   char *pathtoJob;     /* Full path to job data folder */
   char *pathtoJobfile; /* Full path to the job's main file */
@@ -235,7 +234,7 @@ int main(int argc, char *argv[])
 
         // Decompress tarball
         struct stat jbuffer;
-        int jstatus = stat(pathtoJobfile, &jbuffer);
+        int jstatus = stat(pathtoTar, &jbuffer);
         if(jstatus == -1){
           if(DEBUG)
             fprintf(stderr,"Main job file does not exist, extracting...\n");