cvs commit: ALFS/nALFS/src/handlers alfs.c build.c check.c chroot.c configure.c copy.c download.c execute.c link.c log.c make.c mkdir.c move.c owner.c ownership.c package.c patch.c permissions.c postbuild.c prebuild.c remove.c search_replace.c setenv.c stage.c stamp.c su.c textdump.c unpack.c

neven at linuxfromscratch.org neven at linuxfromscratch.org
Tue Nov 4 11:42:51 PST 2003


neven       03/11/04 12:42:51

  Modified:    nALFS    bootstrap
               nALFS/src/handlers alfs.c build.c check.c chroot.c
                        configure.c copy.c download.c execute.c link.c
                        log.c make.c mkdir.c move.c owner.c ownership.c
                        package.c patch.c permissions.c postbuild.c
                        prebuild.c remove.c search_replace.c setenv.c
                        stage.c stamp.c su.c textdump.c unpack.c
  Log:
  Unused functions in handlers put under #if HANDLER_SYNTAX_*.
  
  Revision  Changes    Path
  1.16      +1 -1      ALFS/nALFS/bootstrap
  
  Index: bootstrap
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/bootstrap,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- bootstrap	4 Nov 2003 18:48:48 -0000	1.15
  +++ bootstrap	4 Nov 2003 19:42:51 -0000	1.16
  @@ -28,7 +28,7 @@
   
   all_handlers=`ls src/handlers/*.c | sed 's~src/handlers/\(.*\)\.c~\1~'`
   for handler in ${all_handlers}; do
  -    syntaxes=`grep HANDLER_SYNTAX src/handlers/${handler}.c | sed 's/^.*HANDLER_SYNTAX_\(.*\)$/\1/' | sort -u`
  +    syntaxes=`egrep "#if HANDLER_SYNTAX_[^ ]+$" src/handlers/${handler}.c | sed 's/^.*HANDLER_SYNTAX_\(.*\)$/\1/' | sort -u`
       eval "${handler}_syntaxes=\"${syntaxes}\""
       all_syntaxes="${all_syntaxes} ${syntaxes}"
   done
  
  
  
  1.10      +2 -2      ALFS/nALFS/src/handlers/alfs.c
  
  Index: alfs.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/alfs.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- alfs.c	30 Oct 2003 05:45:35 -0000	1.9
  +++ alfs.c	4 Nov 2003 19:42:51 -0000	1.10
  @@ -34,6 +34,8 @@
   #include "backend.h"
   
   
  +static const char *alfs_parameters[] = { NULL };
  +
   static int alfs_main(element_s *el)
   {
   	return execute_children(el);
  @@ -43,8 +45,6 @@
   /*
    * Handlers' information.
    */
  -
  -static const char *alfs_parameters[] = { NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.11      +6 -2      ALFS/nALFS/src/handlers/build.c
  
  Index: build.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/build.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.c	30 Oct 2003 05:45:35 -0000	1.10
  +++ build.c	4 Nov 2003 19:42:51 -0000	1.11
  @@ -35,6 +35,10 @@
   #include "logging.h"
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *build_parameters[] = { NULL };
  +
   static int build_main(element_s *el)
   {
   	int i;
  @@ -48,12 +52,12 @@
   	return i;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *build_parameters[] = { NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.9       +6 -2      ALFS/nALFS/src/handlers/check.c
  
  Index: check.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/check.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- check.c	30 Oct 2003 05:45:35 -0000	1.8
  +++ check.c	4 Nov 2003 19:42:51 -0000	1.9
  @@ -57,6 +57,10 @@
   #endif
   
   
  +#if HANDLER_SYNTAX_3_0
  +
  +static const char *check_parameters[] = { NULL };
  +
   static int check_main(element_s *el)
   {
   	int status = 0;
  @@ -116,12 +120,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *check_parameters[] = { NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_3_0
  
  
  
  1.11      +7 -3      ALFS/nALFS/src/handlers/chroot.c
  
  Index: chroot.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/chroot.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- chroot.c	30 Oct 2003 05:45:35 -0000	1.10
  +++ chroot.c	4 Nov 2003 19:42:51 -0000	1.11
  @@ -44,6 +44,11 @@
   #include "backend.h"
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *chroot_parameters[] = { NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "dir", NULL };
  +
   static int chroot_main(element_s *el)
   {
   	int status;
  @@ -107,13 +112,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *chroot_parameters[] = { NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "dir", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.10      +15 -7     ALFS/nALFS/src/handlers/configure.c
  
  Index: configure.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/configure.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- configure.c	30 Oct 2003 05:45:35 -0000	1.9
  +++ configure.c	4 Nov 2003 19:42:51 -0000	1.10
  @@ -40,6 +40,11 @@
   #include "backend.h"
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *configure_parameters_ver2[] =
  +{ "base", "command", "param", NULL };
  +
   static int configure_main_ver2(element_s *el)
   {
   	int status;
  @@ -73,6 +78,14 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *configure_parameters_ver3[] =
  +{ "param", "prefix", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "base", "command", NULL };
   
   static int configure_main_ver3(element_s *el)
   {
  @@ -110,17 +123,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *configure_parameters_ver2[] =
  -{ "base", "command", "param", NULL };
  -
  -static const char *configure_parameters_ver3[] =
  -{ "param", "prefix", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "command", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.10      +15 -7     ALFS/nALFS/src/handlers/copy.c
  
  Index: copy.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/copy.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- copy.c	30 Oct 2003 05:45:35 -0000	1.9
  +++ copy.c	4 Nov 2003 19:42:51 -0000	1.10
  @@ -44,6 +44,11 @@
   #define El_copy_destination(el) alloc_trimmed_param_value("destination", el)
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *copy_parameters_ver2[] =
  +{ "options", "base", "source", "destination", NULL };
  +
   static int copy_main_ver2(element_s *el)
   {
   	int status = 0;
  @@ -119,6 +124,14 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *copy_parameters_ver3[] =
  +{ "option", "source", "destination", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   static int copy_main_ver3(element_s *el)
   {
  @@ -206,17 +219,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *copy_parameters_ver2[] =
  -{ "options", "base", "source", "destination", NULL };
  -
  -static const char *copy_parameters_ver3[] =
  -{ "option", "source", "destination", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.10      +7 -3      ALFS/nALFS/src/handlers/download.c
  
  Index: download.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/download.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- download.c	30 Oct 2003 05:45:35 -0000	1.9
  +++ download.c	4 Nov 2003 19:42:51 -0000	1.10
  @@ -49,6 +49,11 @@
   #define El_download_destination(el) alloc_trimmed_param_value("destination", el)
   
   
  +#if HANDLER_SYNTAX_3_1
  +
  +static const char *download_parameters[] =
  +{ "digest", "file", "url", "destination", NULL };
  +
   static int download_main(element_s *el)
   {
   	/* status assumes failure until set otherwise */
  @@ -132,13 +137,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *download_parameters[] =
  -{ "digest", "file", "url", "destination", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_3_1
  
  
  
  1.13      +15 -7     ALFS/nALFS/src/handlers/execute.c
  
  Index: execute.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/execute.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- execute.c	30 Oct 2003 16:33:07 -0000	1.12
  +++ execute.c	4 Nov 2003 19:42:51 -0000	1.13
  @@ -39,6 +39,11 @@
   #include "backend.h"
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *execute_parameters_ver2[] =
  +{ "base", "command", "param", NULL };
  +
   static int execute_main_ver2(element_s *el)
   {
   	int status;
  @@ -80,6 +85,14 @@
   	return alloc_trimmed_param_value("command", el);
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *execute_parameters_ver3[] =
  +{ "base", "command", "param", "prefix", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "base", "command", NULL };
   
   static int execute_main_ver3(element_s *el)
   {
  @@ -132,17 +145,12 @@
   	return NULL;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *execute_parameters_ver2[] =
  -{ "base", "command", "param", NULL };
  -
  -static const char *execute_parameters_ver3[] =
  -{ "base", "command", "param", "prefix", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "command", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.10      +16 -8     ALFS/nALFS/src/handlers/link.c
  
  Index: link.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/link.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- link.c	30 Oct 2003 05:45:35 -0000	1.9
  +++ link.c	4 Nov 2003 19:42:51 -0000	1.10
  @@ -43,6 +43,12 @@
   #define El_link_name(el) alloc_trimmed_param_value("name", el)
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *link_parameters_ver2[] =
  +{ "options", "base", "target", "name", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "type", NULL };
  +
   static int link_main_ver2(element_s *el)
   {
   	int status;
  @@ -125,6 +131,14 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *link_parameters_ver3[] =
  +{ "option", "target", "name", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "type", "base", NULL };
   
   static int link_main_ver3(element_s *el)
   {
  @@ -236,18 +250,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *link_parameters_ver2[] =
  -{ "options", "base", "target", "name", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "type", NULL };
  -
  -static const char *link_parameters_ver3[] =
  -{ "option", "target", "name", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "type", "base", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.11      +6 -2      ALFS/nALFS/src/handlers/log.c
  
  Index: log.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/log.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- log.c	30 Oct 2003 05:45:35 -0000	1.10
  +++ log.c	4 Nov 2003 19:42:51 -0000	1.11
  @@ -34,6 +34,10 @@
   #include "win.h"
   
   
  +#if HANDLER_SYNTAX_2_0 || HANDLER_SYNTAX_3_0
  +
  +static const char *log_parameters[] = { NULL };
  +
   static int log_main(element_s *el)
   {
   	Nprint_h("%s", el->content ? el->content : "");
  @@ -41,12 +45,12 @@
   	return 0;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 || HANDLER_SYNTAX_3_0 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *log_parameters[] = { NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.10      +13 -5     ALFS/nALFS/src/handlers/make.c
  
  Index: make.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/make.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- make.c	30 Oct 2003 05:45:35 -0000	1.9
  +++ make.c	4 Nov 2003 19:42:51 -0000	1.10
  @@ -40,6 +40,10 @@
   #include "backend.h"
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *make_parameters_ver2[] = { "base", "param", NULL };
  +
   static int make_main_ver2(element_s *el)
   {
   	int status;
  @@ -68,6 +72,13 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *make_parameters_ver3[] = { "param", "prefix", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   static int make_main_ver3(element_s *el)
   {
  @@ -102,15 +113,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *make_parameters_ver2[] = { "base", "param", NULL };
  -
  -static const char *make_parameters_ver3[] = { "param", "prefix", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.10      +15 -7     ALFS/nALFS/src/handlers/mkdir.c
  
  Index: mkdir.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/mkdir.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mkdir.c	30 Oct 2003 05:45:35 -0000	1.9
  +++ mkdir.c	4 Nov 2003 19:42:51 -0000	1.10
  @@ -44,6 +44,11 @@
   #define El_mkdir_perm(el) alloc_trimmed_param_value("permissions", el)
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *mkdir_parameters_ver2[] =
  +{ "options", "base", "dir", "permissions", NULL };
  +
   static int mkdir_main_ver2(element_s *el)
   {
   	int status = 0;
  @@ -108,6 +113,14 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *mkdir_parameters_ver3[] =
  +{ "option", "name", "permissions", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   static int mkdir_main_ver3(element_s *el)
   {
  @@ -198,17 +211,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *mkdir_parameters_ver2[] =
  -{ "options", "base", "dir", "permissions", NULL };
  -
  -static const char *mkdir_parameters_ver3[] =
  -{ "option", "name", "permissions", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.10      +15 -7     ALFS/nALFS/src/handlers/move.c
  
  Index: move.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/move.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- move.c	30 Oct 2003 05:45:35 -0000	1.9
  +++ move.c	4 Nov 2003 19:42:51 -0000	1.10
  @@ -44,6 +44,11 @@
   #define El_move_destination(el) alloc_trimmed_param_value("destination", el)
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *move_parameters_ver2[] =
  +{ "options", "base", "source", "destination", NULL };
  +
   static int move_main_ver2(element_s *el)
   {
   	int status = 0;
  @@ -98,6 +103,14 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *move_parameters_ver3[] =
  +{ "option", "source", "destination", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   static int move_main_ver3(element_s *el)
   {
  @@ -161,17 +174,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *move_parameters_ver2[] =
  -{ "options", "base", "source", "destination", NULL };
  -
  -static const char *move_parameters_ver3[] =
  -{ "option", "source", "destination", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.11      +7 -3      ALFS/nALFS/src/handlers/owner.c
  
  Index: owner.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/owner.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- owner.c	30 Oct 2003 05:45:35 -0000	1.10
  +++ owner.c	4 Nov 2003 19:42:51 -0000	1.11
  @@ -45,6 +45,11 @@
   #define El_owner_targets(el) alloc_trimmed_param_value("name", el)
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *owner_parameters[] =
  +{ "options", "base", "user", "group", "name", NULL };
  +
   static int owner_main(element_s *el)
   {
   	int status = 0;
  @@ -169,13 +174,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *owner_parameters[] =
  -{ "options", "base", "user", "group", "name", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.8       +7 -3      ALFS/nALFS/src/handlers/ownership.c
  
  Index: ownership.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/ownership.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ownership.c	30 Oct 2003 05:45:35 -0000	1.7
  +++ ownership.c	4 Nov 2003 19:42:51 -0000	1.8
  @@ -37,6 +37,11 @@
   #include "backend.h"
   
   
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *ownership_parameters[] = { "option", "name", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "base", "user", "group", NULL };
  +
   static int ownership_main(element_s *el)
   {
   	int status = 0;
  @@ -156,13 +161,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *ownership_parameters[] = { "option", "name", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "user", "group", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_3_0
  
  
  
  1.11      +25 -20    ALFS/nALFS/src/handlers/package.c
  
  Index: package.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/package.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- package.c	30 Oct 2003 05:45:35 -0000	1.10
  +++ package.c	4 Nov 2003 19:42:51 -0000	1.11
  @@ -40,6 +40,11 @@
   #include "win.h"
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *package_parameters_ver2[] =
  +{ "name", "version", "base", NULL };
  +
   static int package_main_ver2(element_s *el)
   {
   	int i;
  @@ -68,9 +73,10 @@
   	return NULL;
   }
   
  -/*
  - * ver3
  - */
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
   
   static INLINE int check_utilizes(element_s *utilizes)
   {
  @@ -210,6 +216,20 @@
   }
   
   
  +static const char *package_parameters_ver3[] = { 
  +	"packageinfo",
  +	"description",
  +	"list",
  +	"item",
  +	"para",
  +	"requires",
  +	"utilizes",
  +	"name",
  +	"version",
  +	NULL
  +};
  +// char *HANDLER_SYMBOL(attributes)[] = { "name", "version", "logfile", NULL };
  +
   static int package_main_ver3(element_s *el)
   {
   	int status = 0;
  @@ -253,27 +273,12 @@
   	return NULL;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *package_parameters_ver2[] =
  -{ "name", "version", "base", NULL };
  -
  -static const char *package_parameters_ver3[] = { 
  -	"packageinfo",
  -	"description",
  -	"list",
  -	"item",
  -	"para",
  -	"requires",
  -	"utilizes",
  -	"name",
  -	"version",
  -	NULL
  -};
  -// char *HANDLER_SYMBOL(attributes)[] = { "name", "version", "logfile", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.12      +13 -5     ALFS/nALFS/src/handlers/patch.c
  
  Index: patch.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/patch.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- patch.c	30 Oct 2003 17:59:10 -0000	1.11
  +++ patch.c	4 Nov 2003 19:42:51 -0000	1.12
  @@ -40,6 +40,10 @@
   #include "backend.h"
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *patch_parameters_ver2[] = { "base", "param", NULL };
  +
   static int patch_main_ver2(element_s *el)
   {
   	int status;
  @@ -73,6 +77,13 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *patch_parameters_ver3[] = { "param", "prefix", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   static int patch_main_ver3(element_s *el)
   {
  @@ -123,15 +134,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *patch_parameters_ver2[] = { "base", "param", NULL };
  -
  -static const char *patch_parameters_ver3[] = { "param", "prefix", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.10      +15 -8     ALFS/nALFS/src/handlers/permissions.c
  
  Index: permissions.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/permissions.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- permissions.c	30 Oct 2003 05:45:35 -0000	1.9
  +++ permissions.c	4 Nov 2003 19:42:51 -0000	1.10
  @@ -44,6 +44,11 @@
   #define El_permissions_targets(el) alloc_trimmed_param_value("name", el)
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *permissions_parameters_ver2[] =
  +{ "base", "options", "mode", "name", NULL };
  +
   static int permissions_main_ver2(element_s *el)
   {
   	int status = 0;
  @@ -120,6 +125,14 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *permissions_parameters_ver3[] =
  +{ "option", "name", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "base", "mode", NULL };
   
   static int permissions_main_ver3(element_s *el)
   {
  @@ -193,18 +206,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -
  -static const char *permissions_parameters_ver2[] =
  -{ "base", "options", "mode", "name", NULL };
  -
  -static const char *permissions_parameters_ver3[] =
  -{ "option", "name", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "mode", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.11      +5 -0      ALFS/nALFS/src/handlers/postbuild.c
  
  Index: postbuild.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/postbuild.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- postbuild.c	30 Oct 2003 05:45:35 -0000	1.10
  +++ postbuild.c	4 Nov 2003 19:42:51 -0000	1.11
  @@ -35,6 +35,8 @@
   #include "logging.h"
   
   
  +#if HANDLER_SYNTAX_2_0
  +
   static int postbuild_main(element_s *el)
   {
   	int i;
  @@ -47,6 +49,9 @@
   
   	return i;
   }
  +
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
   
   /*
    * Handlers' information.
  
  
  
  1.11      +4 -0      ALFS/nALFS/src/handlers/prebuild.c
  
  Index: prebuild.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/prebuild.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- prebuild.c	30 Oct 2003 05:45:35 -0000	1.10
  +++ prebuild.c	4 Nov 2003 19:42:51 -0000	1.11
  @@ -35,6 +35,8 @@
   #include "logging.h"
   
   
  +#if HANDLER_SYNTAX_2_0
  +
   static int prebuild_main(element_s *el)
   {
   	int i;
  @@ -47,6 +49,8 @@
   
   	return i;
   }
  +
  +#endif /* HANDLER_SYNTAX_2_0 */
   
   
   /*
  
  
  
  1.11      +11 -2     ALFS/nALFS/src/handlers/remove.c
  
  Index: remove.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/remove.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- remove.c	30 Oct 2003 05:45:35 -0000	1.10
  +++ remove.c	4 Nov 2003 19:42:51 -0000	1.11
  @@ -42,6 +42,11 @@
   #include "backend.h"
   
   
  +static const char *remove_parameters_ver[] = { NULL };
  +
  +
  +#if HANDLER_SYNTAX_2_0
  +
   static INLINE void warn_if_doesnt_exist(const char *file)
   {
           struct stat file_stat;
  @@ -88,6 +93,10 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
   
   static int remove_main_ver3(element_s *el)
   {
  @@ -115,12 +124,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *remove_parameters_ver[] = { NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.11      +15 -7     ALFS/nALFS/src/handlers/search_replace.c
  
  Index: search_replace.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/search_replace.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- search_replace.c	30 Oct 2003 05:45:35 -0000	1.10
  +++ search_replace.c	4 Nov 2003 19:42:51 -0000	1.11
  @@ -183,6 +183,11 @@
   }
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *search_replace_parameters_ver2[] =
  +{ "base", "find", "replace", "file", NULL };
  +
   static int search_replace_main_ver2(element_s *el)
   {
   	int i;
  @@ -195,6 +200,14 @@
   	return i;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *search_replace_parameters_ver3[] =
  +{ "find", "replace", "file", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   static int search_replace_main_ver3(element_s *el)
   {
  @@ -208,17 +221,12 @@
   	return i;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *search_replace_parameters_ver2[] =
  -{ "base", "find", "replace", "file", NULL };
  -
  -static const char *search_replace_parameters_ver3[] =
  -{ "find", "replace", "file", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.10      +6 -2      ALFS/nALFS/src/handlers/setenv.c
  
  Index: setenv.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/setenv.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- setenv.c	30 Oct 2003 05:45:35 -0000	1.9
  +++ setenv.c	4 Nov 2003 19:42:51 -0000	1.10
  @@ -44,6 +44,8 @@
   #define El_setenv_mode(el) attr_value("mode", el)
   
   
  +#if HANDLER_SYNTAX_2_0 || HANDLER_SYNTAX_3_0
  +
   static INLINE int set_variable(const char *variable, const char *value)
   {
   	Nprint_h("Setting environment variable %s:", variable);
  @@ -106,6 +108,8 @@
   }
   
   
  +static const char *setenv_parameters[] = { "variable", "value", NULL };
  +
   static int setenv_main(element_s *el)
   {
   	int i;
  @@ -129,12 +133,12 @@
   	return i;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 || HANDLER_SYNTAX_3_0 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *setenv_parameters[] = { "variable", "value", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.11      +8 -5      ALFS/nALFS/src/handlers/stage.c
  
  Index: stage.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/stage.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- stage.c	3 Nov 2003 21:45:53 -0000	1.10
  +++ stage.c	4 Nov 2003 19:42:51 -0000	1.11
  @@ -50,6 +50,8 @@
   extern char **environ;
   
   
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
   static INLINE int set_supplementary_groups(const char *user, gid_t gid)
   {
   	size_t size;
  @@ -367,6 +369,10 @@
   	return status;
   }
   
  +static const char *stage_parameters[] =
  +{ "stageinfo", "base", "root", "user", "environment", "variable", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = {
  +// "name", "description", "logfile", "mode", NULL };
   
   static int stage_main(element_s *el)
   {
  @@ -404,15 +410,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *stage_parameters[] =
  -{ "stageinfo", "base", "root", "user", "environment", "variable", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = {
  -// "name", "description", "logfile", "mode", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_3_0
  
  
  
  1.9       +7 -3      ALFS/nALFS/src/handlers/stamp.c
  
  Index: stamp.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/stamp.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- stamp.c	30 Oct 2003 05:45:35 -0000	1.8
  +++ stamp.c	4 Nov 2003 19:42:51 -0000	1.9
  @@ -35,6 +35,11 @@
   #include "backend.h"
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *stamp_parameters[] = { NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "name", "version" };
  +
   static int stamp_main(element_s *el)
   {
   	int status = 0;
  @@ -56,13 +61,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *stamp_parameters[] = { NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "name", "version" };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.11      +7 -3      ALFS/nALFS/src/handlers/su.c
  
  Index: su.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/su.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- su.c	30 Oct 2003 05:45:35 -0000	1.10
  +++ su.c	4 Nov 2003 19:42:51 -0000	1.11
  @@ -48,6 +48,8 @@
   #include "utility.h"
   
   
  +#if HANDLER_SYNTAX_2_0
  +
   static INLINE int set_supplementary_groups(const char *user)
   {
   	int i;
  @@ -141,6 +143,9 @@
   }
   
   
  +static const char *su_parameters[] = { NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "user", NULL };
  +
   static int su_main(element_s *el)
   {
   	int status;
  @@ -200,13 +205,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *su_parameters[] = { NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "user", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.12      +18 -8     ALFS/nALFS/src/handlers/textdump.c
  
  Index: textdump.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/textdump.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- textdump.c	30 Oct 2003 05:45:35 -0000	1.11
  +++ textdump.c	4 Nov 2003 19:42:51 -0000	1.12
  @@ -108,6 +108,12 @@
   }
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *textdump_parameters_ver2[] =
  +{ "base", "file", "content", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "mode", NULL };
  +
   static int textdump_main_ver2(element_s *el)
   {
   	int i;
  @@ -120,6 +126,14 @@
   	return i;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *textdump_parameters_ver3[] =
  +{ "file", "content", NULL };
  +// char *HANDLER_SYMBOL(attributes)[] = { "base", "mode", NULL };
   
   static int textdump_main_ver3(element_s *el)
   {
  @@ -134,6 +148,9 @@
   }
   
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
  +
   static char *textdump_data(element_s *el, handler_data_e data)
   {
   	(void) data;
  @@ -142,17 +159,10 @@
   }
   
   
  +
   /*
    * Handlers' information.
    */
  -
  -static const char *textdump_parameters_ver2[] =
  -{ "base", "file", "content", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "mode", NULL };
  -
  -static const char *textdump_parameters_ver3[] =
  -{ "file", "content", NULL };
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "mode", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  
  1.16      +14 -6     ALFS/nALFS/src/handlers/unpack.c
  
  Index: unpack.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/unpack.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- unpack.c	31 Oct 2003 01:47:59 -0000	1.15
  +++ unpack.c	4 Nov 2003 19:42:51 -0000	1.16
  @@ -111,6 +111,11 @@
   }
   
   
  +#if HANDLER_SYNTAX_2_0
  +
  +static const char *unpack_parameters_ver2[] =
  +{ "archive", "destination", NULL };
  +
   static int unpack_main_ver2(element_s *el)
   {
   	int status = 0;
  @@ -155,6 +160,13 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_2_0 */
  +
  +
  +#if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
  +static const char *unpack_parameters_ver3[] =
  +{ "digest", "reference", "archive", "destination", NULL };
   
   static int unpack_main_ver3(element_s *el)
   {
  @@ -236,16 +248,12 @@
   	return status;
   }
   
  +#endif /* HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
  +
   
   /*
    * Handlers' information.
    */
  -
  -static const char *unpack_parameters_ver2[] =
  -{ "archive", "destination", NULL };
  -
  -static const char *unpack_parameters_ver3[] =
  -{ "digest", "reference", "archive", "destination", NULL };
   
   handler_info_s HANDLER_SYMBOL(info)[] = {
   #if HANDLER_SYNTAX_2_0
  
  
  



More information about the alfs-log mailing list