diff --git a/src/client/Makefile.am b/src/client/Makefile.am --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -1,4 +1,4 @@ bin_PROGRAMS = distren distren_SOURCES = distren.c distren_LDADD = @DISTLIBS_LIBS@ @top_builddir@/src/common/libdistren.la -distren_CXXFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common +distren_CFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common diff --git a/src/client/blender.c b/src/client/blender.c new file mode 100644 --- /dev/null +++ b/src/client/blender.c @@ -0,0 +1,63 @@ +/* + Copyright 2008 Nathan Phillip Brink, Ethan Zonca, Matt Orlando + + This file is a part of DistRen. + + DistRen is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + DistRen is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with DistRen. If not, see . +*/ + +#include /* sprintf, printf */ +#include /* malloc, free */ +#include /* strlen */ + + +int blend() +{ + + char *blendercmd; + char *filename = "file.blend"; /* declares a variable to hold the file name */ + char *format = "blender.exe -b \"%s\" -o //tmp/frame -f %d -F JPEG -x 1"; /* the format string to pass to sprintf */ + unsigned int frame_to_render; + size_t blenderstrlen; + + int toreturn; + + //just prove that linking to the shared lib werkz + genericfunc(); + execlisten(); + + // blender = // gets blender structure from server + + /*-- blender structure-- + * file_name + * frame_to_render + * url to dl .blend file + */ + + + frame_to_render = 10; // temporary, the number 10 will be replaced with a function call + + // file_name = job.file_name // retrieves file name from the blender structure ? + + blenderstrlen = strlen(format) - 2 * 2 /* format string minus placeholders */ + strlen(filename) + intstrlen(frame_to_render) + 1 /* NULL terminator */; + blendercmd = malloc(blenderstrlen); + snprintf(blendercmd, blenderstrlen, format, filename, frame_to_render); + + fprintf(stderr, "will run ``%s''\n", blendercmd); + + toreturn = system(blendercmd); + free(blendercmd); + + return toreturn; +} diff --git a/src/client/distren.c b/src/client/distren.c --- a/src/client/distren.c +++ b/src/client/distren.c @@ -19,7 +19,14 @@ #include /* sprintf, printf */ #include /* malloc, free */ -#include /* strlen */ +#include "options.h" + +int main(int argc, char *argv[]) +{ + + + return 0; +}; /* this function should probably not exist. asprintf should be used instead of sprintf */ size_t intstrlen(size_t theint) @@ -36,42 +43,3 @@ size_t intstrlen(size_t theint) } -int main(int argc, char *argv[]) -{ - - char *blendercmd; - char *filename = "file.blend"; /* declares a variable to hold the file name */ - char *format = "blender.exe -b \"%s\" -o //tmp/frame -f %d -F JPEG -x 1"; /* the format string to pass to sprintf */ - unsigned int frame_to_render; - size_t blenderstrlen; - - int toreturn; - - //just prove that linking to the shared lib werkz - genericfunc(); - execlisten(); - - // blender = // gets blender structure from server - - /*-- blender structure-- - * file_name - * frame_to_render - * url to dl .blend file - */ - - - frame_to_render = 10; // temporary, the number 10 will be replaced with a function call - - // file_name = job.file_name // retrieves file name from the blender structure ? - - blenderstrlen = strlen(format) - 2 * 2 /* format string minus placeholders */ + strlen(filename) + intstrlen(frame_to_render) + 1 /* NULL terminator */; - blendercmd = malloc(blenderstrlen); - snprintf(blendercmd, blenderstrlen, format, filename, frame_to_render); - - fprintf(stderr, "will run ``%s''\n", blendercmd); - - toreturn = system(blendercmd); - free(blendercmd); - - return toreturn; -} diff --git a/src/common/options.c b/src/common/options.c --- a/src/common/options.c +++ b/src/common/options.c @@ -27,7 +27,7 @@ int execlisten() /* execlp("ssh", somethingness ) 0); */ - + return 0; } int genericfunc() @@ -53,9 +53,10 @@ int genericfunc() return 1; /* End Conf File Parser */ -printf("Conf File Test", cfg_getstr(cfg, "test")); + printf("Conf File Test: %s\n", cfg_getstr(cfg, "test")); cfg_free(cfg); + return 0; } diff --git a/src/server/Makefile.am b/src/server/Makefile.am --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -1,4 +1,4 @@ bin_PROGRAMS = distrend distrend_SOURCES = distrend.c distrend_LDADD = @DISTLIBS_LIBS@ @top_builddir@/src/common/libdistren.la -distrend_CXXFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common +distrend_CFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common diff --git a/src/server/distrend.c b/src/server/distrend.c --- a/src/server/distrend.c +++ b/src/server/distrend.c @@ -53,16 +53,16 @@ struct blender_job_client // will be sen int current_frame; }; -blender_text_job_parser() +void blender_text_job_parser() { // parse text or other file for job specifications which include: // file_name, start_frame, and end_frame } -blendere_job_que(int x, char job_to_edit[25]) +void blendere_job_que(int x, char job_to_edit[25]) { - struct blender_job_server job[10]; // creates array to store the job + struct blender_job_server job[10]; // creates array to store the job if (x == 0) {