DistRen Changeset - 6e54cb7ffa00 · protofusion repositories

Changeset - 6e54cb7ffa00

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

ethanzonca@zserver2 - 16 years ago 2009-12-19 21:05:22

Minor updates, added hostname to conf parser

3 files changed with 51 insertions and 102 deletions:

INSTALL

src/server/slave.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

INSTALL

➞

Show inline comments

 Installation Instructions
 *************************
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
 , 2007, 2008 Free Software Foundation, Inc.
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
 Software Foundation, Inc.
-   This file is free documentation; the Free Software Foundation gives
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.
 These are generic installation instructions.
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
 you can run in the future to recreate the current configuration, and a
 file `config.log' containing compiler output (useful mainly for
 debugging `configure').
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
 the results of its tests to speed up reconfiguring.  Caching is
+the results of its tests to speed up reconfiguring.  (Caching is
 disabled by default to prevent problems with accidental use of stale
 cache files.
+cache files.)
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
 be considered for the next release.  If you are using the cache, and at
 some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
    The file `configure.ac' (or `configure.in') is used to create
 `configure' by a program called `autoconf'.  You need `configure.ac' if
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 `configure' by a program called `autoconf'.  You only need
 `configure.ac' if you want to change it or regenerate `configure' using
 a newer version of `autoconf'.
 The simplest way to compile this package is:
 . `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
      `./configure' to configure the package for your system.  If you're
      using `csh' on an old version of System V, you might need to type
      `sh ./configure' instead to prevent `csh' from trying to execute
      `configure' itself.
      Running `configure' might take a while.  While running, it prints
      some messages telling which features it is checking for.
      Running `configure' takes awhile.  While running, it prints some
      messages telling which features it is checking for.
 . Type `make' to compile the package.
 . Optionally, type `make check' to run any self-tests that come with
      the package.
@@ @@ -64,63 +64,48 @@ The simplest way to compile this package @@
      a different kind of computer), type `make distclean'.  There is
      also a `make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 . Often, you can also type `make uninstall' to remove the installed
      files again.
 Compilers and Options
 =====================
    Some systems require unusual options for compilation or linking that
 the `configure' script does not know about.  Run `./configure --help'
 for details on some of the pertinent environment variables.
 Some systems require unusual options for compilation or linking that the
 `configure' script does not know about.  Run `./configure --help' for
 details on some of the pertinent environment variables.
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
 is an example:
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
    *Note Defining Variables::, for more details.
 Compiling For Multiple Architectures
 ====================================
-   You can compile the package for more than one kind of computer at the
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
 installed the package for one architecture, use `make distclean' before
 reconfiguring for another architecture.
    On MacOS X 10.5 and later systems, you can create libraries and
 executables that work on multiple system types--known as "fat" or
 "universal" binaries--by specifying multiple `-arch' options to the
 compiler but only a single `-arch' option to the preprocessor.  Like
 this:
      ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
                  CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
                  CPP="gcc -E" CXXCPP="g++ -E"
    This is not guaranteed to produce working output in all cases, you
 may have to build one architecture at a time and combine the results
 using the `lipo' tool if you have problems.
    If you have to use a `make' that does not support the `VPATH'
 variable, you have to compile the package for one architecture at a
 time in the source code directory.  After you have installed the
 package for one architecture, use `make distclean' before reconfiguring
 for another architecture.
 Installation Names
 ==================
-   By default, `make install' installs the package's commands under
 By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ @@ -137,54 +122,32 @@ you can set and what kinds of files go i @@
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
-   Some packages pay attention to `--enable-FEATURE' options to
 Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
 `README' should mention any `--enable-' and `--with-' options that the
 package recognizes.
    For packages that use the X Window System, `configure' can usually
 find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 Particular systems
 ==================
    On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
      ./configure CC="cc -Ae"
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
 to try
      ./configure CC="cc"
 and if that doesn't work, try
      ./configure CC="cc -nodtk"
 Specifying the System Type
 ==========================
    There may be some features `configure' cannot figure out
 automatically, but needs to determine by the type of machine the package
 will run on.  Usually, assuming the package is built to be run on the
 _same_ architectures, `configure' can figure that out, but if it prints
 a message saying it cannot guess the machine type, give it the
 There may be some features `configure' cannot figure out automatically,
 but needs to determine by the type of machine the package will run on.
 Usually, assuming the package is built to be run on the _same_
 architectures, `configure' can figure that out, but if it prints a
 message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
      CPU-COMPANY-SYSTEM
 where SYSTEM can have one of these forms:
@@ @@ -204,55 +167,47 @@ platform different from the build platfo @@
 "host" platform (i.e., that on which the generated programs will
 eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
    If you want to set default values for `configure' scripts to share,
 you can create a site shell script called `config.site' that gives
 default values for variables like `CC', `cache_file', and `prefix'.
 If you want to set default values for `configure' scripts to share, you
 can create a site shell script called `config.site' that gives default
 values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
-   Variables not defined in a site shell script can be set in the
 Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
 them in the `configure' command line, using `VAR=value'.  For example:
      ./configure CC=/usr/local2/bin/gcc
 causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
+overridden in the site shell script).  Here is a another example:
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
 an Autoconf bug.  Until the bug is fixed you can use this workaround:
      /bin/bash ./configure CONFIG_SHELL=/bin/bash
      CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
 configuration-related scripts to be executed by `/bin/bash'.
 `configure' Invocation
 ======================
    `configure' recognizes the following options to control how it
 operates.
 `configure' recognizes the following options to control how it operates.
 `--help'
 `-h'
      Print a summary of all of the options to `configure', and exit.
 `--help=short'
 `--help=recursive'
      Print a summary of the options unique to this package's
      `configure', and exit.  The `short' variant lists options used
      only in the top level, while the `recursive' variant lists options
      also present in any nested packages.
      Print a summary of the options to `configure', and exit.
 `--version'
 `-V'
      Print the version of Autoconf used to generate the `configure'
      script, and exit.
@@ @@ -273,19 +228,9 @@ operates. @@
      messages will still be shown).
 `--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 `--prefix=DIR'
      Use DIR as the installation prefix.  *Note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 `--no-create'
 `-n'
      Run the configure checks, but stop before creating any output
      files.
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.

src/server/slave.c

➞

Show inline comments

@@ @@ -38,16 +38,18 @@ int main(int argc, char *argv[]) @@
   int tmp;
   char *datadir;
   char *server;
   char *username;
   char *hostname;
   cfg_opt_t myopts[] = {
     CFG_SIMPLE_STR("username", &username),
     CFG_SIMPLE_STR("datadir", &datadir),
     CFG_SIMPLE_STR("server", &server),
     CFG_SIMPLE_STR("hostname", &hostname),
     CFG_END()
   };
   cfg_t * my_cfg;
   struct options_common *commonopts;
@@ @@ -106,14 +108,16 @@ int main(int argc, char *argv[]) @@
   /* Get conf data */
   options_init(argc, argv, &my_cfg, myopts, "slave", &commonopts);
   /* Notifies the user if there no username in .conf */
   if(username == NULL || strcmp(username, "!username") == 0 )
+  if(username == NULL || strcmp(username, "!username") == 0 ) {
     fprintf(stderr, "\nPlease ensure that your username is present in distrenslave.conf\n");
     return 0;
+  }
   else
     if( username != NULL || strcmp(username, "!username") != 0 )
+      {
 	// Log in the user
 	if(login_user(username) == 1){
 	  fprintf(stderr, "You should now be logged into distren.\n");

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -47,13 +47,13 @@ int sendSignal(struct remoteio *rem, cha @@
   _distren_asprintf(&ssignal, "%c", signal);
   towrite = strlen(ssignal);
   while( towrite
 	 && !remoteio_write(rem, ssignal, towrite, &written))
+    {
       fprintf(stderr, "Writing...");
+      fprintf(stderr, "Writing...\n");
       towrite -= written;
+    }
   if(written)
     return 0;
   /**
@@ @@ -72,13 +72,13 @@ int sendExtSignal(struct remoteio *rem, @@
   char *ssignal;
   _distren_asprintf(&ssignal, "%c%s", signal, data); // Just append the data FIXME: We should do this differently
   towrite = strlen(ssignal);
   while( towrite
           && !remoteio_write(rem, ssignal, towrite, &written))
+     {
        fprintf(stderr, "Writing...");
+       fprintf(stderr, "Writing...\n");
        towrite -= written;
+     }
    if(written)
      return 0;
    /**

0 comments (0 inline, 0 general)