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

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Mon Feb 23 18:25:35 PST 2004


kpfleming    04/02/23 19:25:35

  Modified:    nALFS/src/handlers alfs.c build.c check.c chroot.c
                        conditionals.c configure.c copy.c download.c
                        execute.c link.c make.c mkdir.c move.c ownership.c
                        package.c patch.c permissions.c postbuild.c
                        prebuild.c remove.c search_replace.c setenv.c
                        stamp.c su.c textdump.c unpack.c
  Log:
  provide handler_attribute structures for all handlers
  clean up handler_info structures (remove unnecessary initializations)
  
  Revision  Changes    Path
  1.16      +0 -12     ALFS/nALFS/src/handlers/alfs.c
  
  Index: alfs.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/alfs.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- alfs.c	21 Feb 2004 19:03:32 -0000	1.15
  +++ alfs.c	24 Feb 2004 02:25:34 -0000	1.16
  @@ -57,9 +57,6 @@
   		.syntax_version = "2.0",
   		.main = alfs_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
  -		.is_action = 0,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -69,9 +66,6 @@
   		.syntax_version = "3.0",
   		.main = alfs_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
  -		.is_action = 0,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -81,9 +75,6 @@
   		.syntax_version = "3.1",
   		.main = alfs_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
  -		.is_action = 0,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -93,10 +84,7 @@
   		.syntax_version = "3.2",
   		.main = alfs_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
  -		.is_action = 0,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.15      +0 -3      ALFS/nALFS/src/handlers/build.c
  
  Index: build.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/build.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.c	21 Feb 2004 19:03:32 -0000	1.14
  +++ build.c	24 Feb 2004 02:25:34 -0000	1.15
  @@ -66,9 +66,6 @@
   		.syntax_version = "2.0",
   		.main = build_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
  -		.is_action = 0,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.14      +0 -2      ALFS/nALFS/src/handlers/check.c
  
  Index: check.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/check.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- check.c	21 Feb 2004 19:03:32 -0000	1.13
  +++ check.c	24 Feb 2004 02:25:34 -0000	1.14
  @@ -134,9 +134,7 @@
   		.syntax_version = "3.0",
   		.main = check_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.16      +5 -4      ALFS/nALFS/src/handlers/chroot.c
  
  Index: chroot.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/chroot.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- chroot.c	21 Feb 2004 19:03:32 -0000	1.15
  +++ chroot.c	24 Feb 2004 02:25:34 -0000	1.16
  @@ -46,7 +46,10 @@
   
   #if HANDLER_SYNTAX_2_0
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "dir", NULL };
  +static const struct handler_attribute chroot_attributes[] = {
  +	{ .name = "dir" },
  +	{ .name = NULL }
  +};
   
   static int chroot_main(element_s * const el)
   {
  @@ -126,9 +129,7 @@
   		.syntax_version = "2.0",
   		.main = chroot_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
  -		.is_action = 0,
  -		.priority = 0
  +		.attributes = chroot_attributes,
   	},
   #endif
   	{
  
  
  
  1.9       +9 -18     ALFS/nALFS/src/handlers/conditionals.c
  
  Index: conditionals.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/conditionals.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- conditionals.c	23 Feb 2004 21:19:35 -0000	1.8
  +++ conditionals.c	24 Feb 2004 02:25:34 -0000	1.9
  @@ -80,12 +80,18 @@
   
   #if HANDLER_SYNTAX_3_1
   
  -static const struct handler_parameter if_parameters_3_1[] = {
  +static const struct handler_parameter if_parameters_v3_1[] = {
   	{ .name = "then" },
   	{ .name = "else" },
   	{ .name = NULL }
   };
   
  +static const struct handler_attribute if_attributes_v3_1[] = {
  +	{ .name = "test" },
  +	{ .name = "package" },
  +	{ .name = NULL }
  +};
  +
   static int if_main_3_1(element_s * const element)
   {
   	char *shelltest;
  @@ -274,12 +280,11 @@
   		.name = "if",
   		.description = "if",
   		.syntax_version = "3.1",
  -		.parameters = if_parameters_3_1,
  +		.parameters = if_parameters_v3_1,
  +		.attributes = if_attributes_v3_1,
   		.main = if_main_3_1,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -290,10 +295,8 @@
   		.parameters = if_parameters_3_2,
   		.main = if_main_3_2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   	{
   		.name = "and",
  @@ -302,10 +305,8 @@
   		.parameters = boolean_parameters_3_2,
   		.test = and_test_3_2,
   		.type = HTYPE_TEST,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   	{
   		.name = "or",
  @@ -314,10 +315,8 @@
   		.parameters = boolean_parameters_3_2,
   		.test = or_test_3_2,
   		.type = HTYPE_TEST,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   	{
   		.name = "not",
  @@ -326,10 +325,8 @@
   		.parameters = boolean_parameters_3_2,
   		.test = not_test_3_2,
   		.type = HTYPE_TEST,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   	{
   		.name = "test",
  @@ -337,10 +334,8 @@
   		.syntax_version = "3.2",
   		.test = shelltest_test_3_2,
   		.type = HTYPE_TEST,
  -		.alloc_data = NULL,
   		.alternate_shell = 1,
   		.is_action = 1,
  -		.priority = 0
   	},
   	{
   		.name = "package-built",
  @@ -348,10 +343,8 @@
   		.syntax_version = "3.2",
   		.test = package_built_test_3_2,
   		.type = HTYPE_TEST,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   	{
   		.name = "package-version",
  @@ -359,10 +352,8 @@
   		.syntax_version = "3.2",
   		.test = package_version_test_3_2,
   		.type = HTYPE_TEST,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.17      +12 -13    ALFS/nALFS/src/handlers/configure.c
  
  Index: configure.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/configure.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- configure.c	23 Feb 2004 21:19:35 -0000	1.16
  +++ configure.c	24 Feb 2004 02:25:34 -0000	1.17
  @@ -87,13 +87,17 @@
   
   #if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 || HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter configure_parameters_ver3[] = {
  +static const struct handler_parameter configure_parameters_v3[] = {
   	{ .name = "prefix" },
   	{ .name = "param" },
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "command", NULL };
  +static const struct handler_attribute configure_attributes_v3[] = {
  +	{ .name = "base" },
  +	{ .name = "command" },
  +	{ .name = NULL }
  +};
   
   static int configure_main_ver3(element_s * const el)
   {
  @@ -147,9 +151,7 @@
   		.parameters = configure_parameters_ver2,
   		.main = configure_main_ver2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -157,12 +159,11 @@
   		.name = "configure",
   		.description = "Configure",
   		.syntax_version = "3.0",
  -		.parameters = configure_parameters_ver3,
  +		.parameters = configure_parameters_v3,
  +		.attributes = configure_attributes_v3,
   		.main = configure_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -170,12 +171,11 @@
   		.name = "configure",
   		.description = "Configure",
   		.syntax_version = "3.1",
  -		.parameters = configure_parameters_ver3,
  +		.parameters = configure_parameters_v3,
  +		.attributes = configure_attributes_v3,
   		.main = configure_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -183,13 +183,12 @@
   		.name = "configure",
   		.description = "Configure",
   		.syntax_version = "3.2",
  -		.parameters = configure_parameters_ver3,
  +		.parameters = configure_parameters_v3,
  +		.attributes = configure_attributes_v3,
   		.main = configure_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.17      +11 -13    ALFS/nALFS/src/handlers/copy.c
  
  Index: copy.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/copy.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- copy.c	23 Feb 2004 21:19:35 -0000	1.16
  +++ copy.c	24 Feb 2004 02:25:34 -0000	1.17
  @@ -134,14 +134,17 @@
   
   #if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 || HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter copy_parameters_ver3[] = {
  +static const struct handler_parameter copy_parameters_v3[] = {
   	{ .name = "option" },
   	{ .name = "source" },
   	{ .name = "destination" },
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
  +static const struct handler_attribute copy_attributes_v3[] = {
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
   
   static int copy_main_ver3(element_s * const el)
   {
  @@ -245,9 +248,7 @@
   		.parameters = copy_parameters_ver2,
   		.main = copy_main_ver2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -255,12 +256,11 @@
   		.name = "copy",
   		.description = "Copy",
   		.syntax_version = "3.0",
  -		.parameters = copy_parameters_ver3,
  +		.parameters = copy_parameters_v3,
  +		.attributes = copy_attributes_v3,
   		.main = copy_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -268,12 +268,11 @@
   		.name = "copy",
   		.description = "Copy",
   		.syntax_version = "3.1",
  -		.parameters = copy_parameters_ver3,
  +		.parameters = copy_parameters_v3,
  +		.attributes = copy_attributes_v3,
   		.main = copy_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -281,13 +280,12 @@
   		.name = "copy",
   		.description = "Copy",
   		.syntax_version = "3.2",
  -		.parameters = copy_parameters_ver3,
  +		.parameters = copy_parameters_v3,
  +		.attributes = copy_attributes_v3,
   		.main = copy_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.18      +8 -6      ALFS/nALFS/src/handlers/download.c
  
  Index: download.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/download.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- download.c	23 Feb 2004 21:19:35 -0000	1.17
  +++ download.c	24 Feb 2004 02:25:34 -0000	1.18
  @@ -145,13 +145,18 @@
   
   #if HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter download_parameters_3_2[] = {
  +static const struct handler_parameter download_parameters_v3_2[] = {
   	{ .name = "digest" },
   	{ .name = "file" },
   	{ .name = "url" },
   	{ .name = NULL }
   };
   
  +static const struct handler_attribute download_attributes_v3_2[] = {
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
  +
   static int download_main_3_2(element_s * const el)
   {
   	/* status assumes failure until set otherwise */
  @@ -256,9 +261,7 @@
   		.parameters = download_parameters,
   		.main = download_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -266,13 +269,12 @@
   		.name = "download",
   		.description = "Download",
   		.syntax_version = "3.2",
  -		.parameters = download_parameters_3_2,
  +		.parameters = download_parameters_v3_2,
  +		.attributes = download_attributes_v3_2,
   		.main = download_main_3_2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.23      +20 -13    ALFS/nALFS/src/handlers/execute.c
  
  Index: execute.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/execute.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- execute.c	23 Feb 2004 21:19:35 -0000	1.22
  +++ execute.c	24 Feb 2004 02:25:34 -0000	1.23
  @@ -46,7 +46,7 @@
   
   #if HANDLER_SYNTAX_2_0
   
  -static const struct handler_parameter execute_parameters_ver2[] = {
  +static const struct handler_parameter execute_parameters_v2[] = {
   	{ .name = "base" },
   	{ .name = "command" },
   	{ .name = "param" },
  @@ -100,13 +100,17 @@
   
   #if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
   
  -static const struct handler_parameter execute_parameters_ver3[] = {
  +static const struct handler_parameter execute_parameters_v3[] = {
   	{ .name = "prefix" },
   	{ .name = "param" },
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "command", NULL };
  +static const struct handler_attribute execute_attributes_v3[] = {
  +	{ .name = "command" },
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
   
   static int execute_main_ver3(element_s * const el)
   {
  @@ -165,14 +169,18 @@
   
   #ifdef HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter execute_parameters_ver3_2[] = {
  +static const struct handler_parameter execute_parameters_v3_2[] = {
   	{ .name = "prefix" },
   	{ .name = "param" },
   	{ .name = "content" },
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "command", NULL };
  +static const struct handler_attribute execute_attributes_v3_2[] = {
  +	{ .name = "command" },
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
   
   static int execute_main_ver3_2(element_s * const el)
   {
  @@ -288,12 +296,11 @@
   		.name = "execute",
   		.description = "Execute",
   		.syntax_version = "2.0",
  -		.parameters = execute_parameters_ver2,
  +		.parameters = execute_parameters_v2,
   		.main = execute_main_ver2,
   		.type = HTYPE_EXECUTE,
   		.alloc_data = execute_data_ver2,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -301,12 +308,12 @@
   		.name = "execute",
   		.description = "Execute",
   		.syntax_version = "3.0",
  -		.parameters = execute_parameters_ver3,
  +		.parameters = execute_parameters_v3,
  +		.attributes = execute_attributes_v3,
   		.main = execute_main_ver3,
   		.type = HTYPE_EXECUTE,
   		.alloc_data = execute_data_ver3,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -314,12 +321,12 @@
   		.name = "execute",
   		.description = "Execute",
   		.syntax_version = "3.1",
  -		.parameters = execute_parameters_ver3,
  +		.parameters = execute_parameters_v3,
  +		.attributes = execute_attributes_v3,
   		.main = execute_main_ver3,
   		.type = HTYPE_EXECUTE,
   		.alloc_data = execute_data_ver3,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -327,13 +334,13 @@
   		.name = "execute",
   		.description = "Execute",
   		.syntax_version = "3.2",
  -		.parameters = execute_parameters_ver3_2,
  +		.parameters = execute_parameters_v3_2,
  +		.attributes = execute_attributes_v3_2,
   		.main = execute_main_ver3_2,
   		.type = HTYPE_EXECUTE,
   		.alloc_data = execute_data_ver3_2,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.17      +19 -16    ALFS/nALFS/src/handlers/link.c
  
  Index: link.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/link.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- link.c	23 Feb 2004 21:19:35 -0000	1.16
  +++ link.c	24 Feb 2004 02:25:34 -0000	1.17
  @@ -45,7 +45,7 @@
   
   #if HANDLER_SYNTAX_2_0
   
  -static const struct handler_parameter link_parameters_ver2[] = {
  +static const struct handler_parameter link_parameters_v2[] = {
   	{ .name = "base" },
   	{ .name = "options" },
   	{ .name = "target" },
  @@ -53,7 +53,10 @@
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "type", NULL };
  +static const struct handler_attribute link_attributes_v2[] = {
  +	{ .name = "type" },
  +	{ .name = NULL }
  +};
   
   static int link_main_ver2(element_s * const el)
   {
  @@ -142,14 +145,18 @@
   
   #if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 || HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter link_parameters_ver3[] = {
  +static const struct handler_parameter link_parameters_v3[] = {
   	{ .name = "option" },
   	{ .name = "target" },
   	{ .name = "name" },
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "type", "base", NULL };
  +static const struct handler_attribute link_attributes_v3[] = {
  +	{ .name = "type" },
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
   
   static int link_main_ver3(element_s * const el)
   {
  @@ -274,12 +281,11 @@
   		.name = "link",
   		.description = "Link",
   		.syntax_version = "2.0",
  -		.parameters = link_parameters_ver2,
  +		.parameters = link_parameters_v2,
  +		.attributes = link_attributes_v2,
   		.main = link_main_ver2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -287,12 +293,11 @@
   		.name = "link",
   		.description = "Link",
   		.syntax_version = "3.0",
  -		.parameters = link_parameters_ver3,
  +		.parameters = link_parameters_v3,
  +		.attributes = link_attributes_v3,
   		.main = link_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -300,12 +305,11 @@
   		.name = "link",
   		.description = "Link",
   		.syntax_version = "3.1",
  -		.parameters = link_parameters_ver3,
  +		.parameters = link_parameters_v3,
  +		.attributes = link_attributes_v3,
   		.main = link_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -313,13 +317,12 @@
   		.name = "link",
   		.description = "Link",
   		.syntax_version = "3.2",
  -		.parameters = link_parameters_ver3,
  +		.parameters = link_parameters_v3,
  +		.attributes = link_attributes_v3,
   		.main = link_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.17      +11 -13    ALFS/nALFS/src/handlers/make.c
  
  Index: make.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/make.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- make.c	23 Feb 2004 21:19:35 -0000	1.16
  +++ make.c	24 Feb 2004 02:25:34 -0000	1.17
  @@ -81,13 +81,16 @@
   
   #if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 || HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter make_parameters_ver3[] = {
  +static const struct handler_parameter make_parameters_v3[] = {
   	{ .name = "prefix" },
   	{ .name = "param" },
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
  +static const struct handler_attribute make_attributes_v3[] = {
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
   
   static int make_main_ver3(element_s * const el)
   {
  @@ -138,9 +141,7 @@
   		.parameters = make_parameters_ver2,
   		.main = make_main_ver2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -148,12 +149,11 @@
   		.name = "make",
   		.description = "Run make",
   		.syntax_version = "3.0",
  -		.parameters = make_parameters_ver3,
  +		.parameters = make_parameters_v3,
  +		.attributes = make_attributes_v3,
   		.main = make_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -161,12 +161,11 @@
   		.name = "make",
   		.description = "Run make",
   		.syntax_version = "3.1",
  -		.parameters = make_parameters_ver3,
  +		.parameters = make_parameters_v3,
  +		.attributes = make_attributes_v3,
   		.main = make_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -174,13 +173,12 @@
   		.name = "make",
   		.description = "Run make",
   		.syntax_version = "3.2",
  -		.parameters = make_parameters_ver3,
  +		.parameters = make_parameters_v3,
  +		.attributes = make_attributes_v3,
   		.main = make_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.17      +11 -13    ALFS/nALFS/src/handlers/mkdir.c
  
  Index: mkdir.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/mkdir.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mkdir.c	23 Feb 2004 21:19:35 -0000	1.16
  +++ mkdir.c	24 Feb 2004 02:25:34 -0000	1.17
  @@ -123,14 +123,17 @@
   
   #if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 || HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter mkdir_parameters_ver3[] = {
  +static const struct handler_parameter mkdir_parameters_v3[] = {
   	{ .name = "option" },
   	{ .name = "name" },
   	{ .name = "permissions" },
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
  +static const struct handler_attribute mkdir_attributes_v3[] = {
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
   
   static int mkdir_main_ver3(element_s * const el)
   {
  @@ -237,9 +240,7 @@
   		.parameters = mkdir_parameters_ver2,
   		.main = mkdir_main_ver2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -247,12 +248,11 @@
   		.name = "mkdir",
   		.description = "Make directories",
   		.syntax_version = "3.0",
  -		.parameters = mkdir_parameters_ver3,
  +		.parameters = mkdir_parameters_v3,
  +		.attributes = mkdir_attributes_v3,
   		.main = mkdir_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -260,12 +260,11 @@
   		.name = "mkdir",
   		.description = "Make directories",
   		.syntax_version = "3.1",
  -		.parameters = mkdir_parameters_ver3,
  +		.parameters = mkdir_parameters_v3,
  +		.attributes = mkdir_attributes_v3,
   		.main = mkdir_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -273,13 +272,12 @@
   		.name = "mkdir",
   		.description = "Make directories",
   		.syntax_version = "3.2",
  -		.parameters = mkdir_parameters_ver3,
  +		.parameters = mkdir_parameters_v3,
  +		.attributes = mkdir_attributes_v3,
   		.main = mkdir_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.17      +11 -13    ALFS/nALFS/src/handlers/move.c
  
  Index: move.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/move.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- move.c	23 Feb 2004 21:19:35 -0000	1.16
  +++ move.c	24 Feb 2004 02:25:34 -0000	1.17
  @@ -113,14 +113,17 @@
   
   #if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 || HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter move_parameters_ver3[] = {
  +static const struct handler_parameter move_parameters_v3[] = {
   	{ .name = "option" },
   	{ .name = "source" },
   	{ .name = "destination" },
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
  +static const struct handler_attribute move_attributes_v3[] = {
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
   
   static int move_main_ver3(element_s * const el)
   {
  @@ -200,9 +203,7 @@
   		.parameters = move_parameters_ver2,
   		.main = move_main_ver2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -210,12 +211,11 @@
   		.name = "move",
   		.description = "Move files",
   		.syntax_version = "3.0",
  -		.parameters = move_parameters_ver3,
  +		.parameters = move_parameters_v3,
  +		.attributes = move_attributes_v3,
   		.main = move_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -223,12 +223,11 @@
   		.name = "move",
   		.description = "Move files",
   		.syntax_version = "3.1",
  -		.parameters = move_parameters_ver3,
  +		.parameters = move_parameters_v3,
  +		.attributes = move_attributes_v3,
   		.main = move_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -236,13 +235,12 @@
   		.name = "move",
   		.description = "Move files",
   		.syntax_version = "3.2",
  -		.parameters = move_parameters_ver3,
  +		.parameters = move_parameters_v3,
  +		.attributes = move_attributes_v3,
   		.main = move_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.15      +10 -8     ALFS/nALFS/src/handlers/ownership.c
  
  Index: ownership.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/ownership.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ownership.c	23 Feb 2004 21:19:35 -0000	1.14
  +++ ownership.c	24 Feb 2004 02:25:34 -0000	1.15
  @@ -45,7 +45,12 @@
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "user", "group", NULL };
  +static const struct handler_attribute ownership_attributes[] = {
  +	{ .name = "base" },
  +	{ .name = "user" },
  +	{ .name = "group" },
  +	{ .name = NULL }
  +};
   
   static int ownership_main(element_s *const el)
   {
  @@ -180,11 +185,10 @@
   		.description = "Change ownership",
   		.syntax_version = "3.0",
   		.parameters = ownership_parameters,
  +		.attributes = ownership_attributes,
   		.main = ownership_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -193,11 +197,10 @@
   		.description = "Change ownership",
   		.syntax_version = "3.1",
   		.parameters = ownership_parameters,
  +		.attributes = ownership_attributes,
   		.main = ownership_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -205,13 +208,12 @@
   		.name = "ownership",
   		.description = "Change ownership",
   		.syntax_version = "3.2",
  -		.parameters = ownership_parameters,
  +		.parameters = ownership_parameters,	
  +		.attributes = ownership_attributes,
   		.main = ownership_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.19      +15 -15    ALFS/nALFS/src/handlers/package.c
  
  Index: package.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/package.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- package.c	23 Feb 2004 21:19:35 -0000	1.18
  +++ package.c	24 Feb 2004 02:25:34 -0000	1.19
  @@ -42,7 +42,7 @@
   
   #if HANDLER_SYNTAX_2_0
   
  -static const struct handler_parameter package_parameters_ver2[] = {
  +static const struct handler_parameter package_parameters_v2[] = {
   	{ .name = "name" },
   	{ .name = "version" },
   	{ .name = "base" },
  @@ -223,7 +223,7 @@
   }
   
   
  -static const struct handler_parameter package_parameters_ver3[] = {
  +static const struct handler_parameter package_parameters_v3[] = {
   	{ .name = "name" },
   	{ .name = "version" },
   	{ .name = "packageinfo" },
  @@ -236,7 +236,12 @@
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "name", "version", "logfile", NULL };
  +static const struct handler_attribute package_attributes_v3[] = {
  +	{ .name = "name" },
  +	{ .name = "version" },
  +	{ .name = "logfile" },
  +	{ .name = NULL }
  +};
   
   static int package_main_ver3(element_s * const el)
   {
  @@ -297,12 +302,10 @@
   		.name = "package",
   		.description = "Package",
   		.syntax_version = "2.0",
  -		.parameters = package_parameters_ver2,
  +		.parameters = package_parameters_v2,
   		.main = package_main_ver2,
   		.type = HTYPE_PACKAGE,
   		.alloc_data = package_data_ver2,
  -		.is_action = 0,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -310,12 +313,11 @@
   		.name = "package",
   		.description = "Package",
   		.syntax_version = "3.0",
  -		.parameters = package_parameters_ver3,
  +		.parameters = package_parameters_v3,
  +		.attributes = package_attributes_v3,
   		.main = package_main_ver3,
   		.type = HTYPE_PACKAGE,
   		.alloc_data = package_data_ver3,
  -		.is_action = 0,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -323,12 +325,11 @@
   		.name = "package",
   		.description = "Package",
   		.syntax_version = "3.1",
  -		.parameters = package_parameters_ver3,
  +		.parameters = package_parameters_v3,
  +		.attributes = package_attributes_v3,
   		.main = package_main_ver3,
   		.type = HTYPE_PACKAGE,
   		.alloc_data = package_data_ver3,
  -		.is_action = 0,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -336,13 +337,12 @@
   		.name = "package",
   		.description = "Package",
   		.syntax_version = "3.2",
  -		.parameters = package_parameters_ver3,
  +		.parameters = package_parameters_v3,
  +		.attributes = package_attributes_v3,
   		.main = package_main_ver3,
   		.type = HTYPE_PACKAGE,
   		.alloc_data = package_data_ver3,
  -		.is_action = 0,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.21      +21 -15    ALFS/nALFS/src/handlers/patch.c
  
  Index: patch.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/patch.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- patch.c	23 Feb 2004 21:19:35 -0000	1.20
  +++ patch.c	24 Feb 2004 02:25:34 -0000	1.21
  @@ -44,7 +44,7 @@
   
   #if HANDLER_SYNTAX_2_0
   
  -static const struct handler_parameter patch_parameters_ver2[] = {
  +static const struct handler_parameter patch_parameters_v2[] = {
   	{ .name = "base" },
   	{ .name = "param" },
   	{ .name = NULL }
  @@ -88,12 +88,17 @@
   
   #if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
   
  -static const struct handler_parameter patch_parameters_ver3[] = {
  +static const struct handler_parameter patch_parameters_v3[] = {
   	{ .name = "prefix" },
   	{ .name = "param" },
   	{ .name = NULL }
   };
   
  +static const struct handler_attribute patch_attributes_v3[] = {
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
  +
   // char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
   
   static int patch_main_ver3(element_s * const el)
  @@ -150,7 +155,7 @@
   
   #if HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter patch_parameters_ver3_2[] = {
  +static const struct handler_parameter patch_parameters_v3_2[] = {
   	{ .name = "prefix" },
   	{ .name = "param" },
   	{ .name = "digest" },
  @@ -159,7 +164,12 @@
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "mode", "path_strip", NULL };
  +static const struct handler_attribute patch_attributes_v3_2[] = {
  +	{ .name = "base" },
  +	{ .name = "mode" },
  +	{ .name = "path_strip" },
  +	{ .name = NULL }
  +};
   
   static int patch_main_ver3_2(element_s * const el)
   {
  @@ -293,12 +303,10 @@
   		.name = "patch",
   		.description = "Patch",
   		.syntax_version = "2.0",
  -		.parameters = patch_parameters_ver2,
  +		.parameters = patch_parameters_v2,
   		.main = patch_main_ver2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -306,12 +314,11 @@
   		.name = "patch",
   		.description = "Patch",
   		.syntax_version = "3.0",
  -		.parameters = patch_parameters_ver3,
  +		.parameters = patch_parameters_v3,
  +		.attributes = patch_attributes_v3,
   		.main = patch_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -319,12 +326,12 @@
   		.name = "patch",
   		.description = "Patch",
   		.syntax_version = "3.1",
  -		.parameters = patch_parameters_ver3,
  +		.parameters = patch_parameters_v3,
  +		.attributes = patch_attributes_v3,
   		.main = patch_main_ver3,
   		.type = HTYPE_NORMAL,
   		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -332,13 +339,12 @@
   		.name = "patch",
   		.description = "Patch",
   		.syntax_version = "3.2",
  -		.parameters = patch_parameters_ver3_2,
  +		.parameters = patch_parameters_v3_2,
  +		.attributes = patch_attributes_v3_2,
   		.main = patch_main_ver3_2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.17      +12 -13    ALFS/nALFS/src/handlers/permissions.c
  
  Index: permissions.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/permissions.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- permissions.c	23 Feb 2004 21:19:35 -0000	1.16
  +++ permissions.c	24 Feb 2004 02:25:34 -0000	1.17
  @@ -135,13 +135,17 @@
   
   #if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 || HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter permissions_parameters_ver3[] = {
  +static const struct handler_parameter permissions_parameters_v3[] = {
   	{ .name = "option" },
   	{ .name = "name" },
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "mode", NULL };
  +static const struct handler_attribute permissions_attributes_v3[] = {
  +	{ .name = "base" },
  +	{ .name = "mode" },
  +	{ .name = NULL }
  +};
   
   static int permissions_main_ver3(element_s * const el)
   {
  @@ -231,9 +235,7 @@
   		.parameters = permissions_parameters_ver2,
   		.main = permissions_main_ver2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -241,12 +243,11 @@
   		.name = "permissions",
   		.description = "Change permissions",
   		.syntax_version = "3.0",
  -		.parameters = permissions_parameters_ver3,
  +		.parameters = permissions_parameters_v3,
  +		.attributes = permissions_attributes_v3,
   		.main = permissions_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -254,12 +255,11 @@
   		.name = "permissions",
   		.description = "Change permissions",
   		.syntax_version = "3.1",
  -		.parameters = permissions_parameters_ver3,
  +		.parameters = permissions_parameters_v3,
  +		.attributes = permissions_attributes_v3,
   		.main = permissions_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -267,13 +267,12 @@
   		.name = "permissions",
   		.description = "Change permissions",
   		.syntax_version = "3.2",
  -		.parameters = permissions_parameters_ver3,
  +		.parameters = permissions_parameters_v3,
  +		.attributes = permissions_attributes_v3,
   		.main = permissions_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.15      +0 -2      ALFS/nALFS/src/handlers/postbuild.c
  
  Index: postbuild.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/postbuild.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- postbuild.c	21 Feb 2004 19:03:32 -0000	1.14
  +++ postbuild.c	24 Feb 2004 02:25:34 -0000	1.15
  @@ -65,9 +65,7 @@
   		.syntax_version = "2.0",
   		.main = postbuild_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 0,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.15      +0 -2      ALFS/nALFS/src/handlers/prebuild.c
  
  Index: prebuild.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/prebuild.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- prebuild.c	21 Feb 2004 19:03:32 -0000	1.14
  +++ prebuild.c	24 Feb 2004 02:25:34 -0000	1.15
  @@ -66,9 +66,7 @@
   		.syntax_version = "2.0",
   		.main = prebuild_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.21      +12 -14    ALFS/nALFS/src/handlers/remove.c
  
  Index: remove.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/remove.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- remove.c	23 Feb 2004 21:19:35 -0000	1.20
  +++ remove.c	24 Feb 2004 02:25:34 -0000	1.21
  @@ -41,11 +41,6 @@
   #include "parser.h"
   #include "backend.h"
   
  -static const struct handler_parameter remove_parameters_ver3_2[] = {
  -	{ .name = "file" },
  -	{ .name = NULL }
  -};
  -
   #if HANDLER_SYNTAX_2_0
   
   static INLINE void warn_if_doesnt_exist(const char *file)
  @@ -129,6 +124,16 @@
   
   #if HANDLER_SYNTAX_3_2
   
  +static const struct handler_parameter remove_parameters_v3_2[] = {
  +	{ .name = "file" },
  +	{ .name = NULL }
  +};
  +
  +static const struct handler_attribute remove_attributes_v3_2[] = {
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
  +
   static int remove_main_ver3_2(element_s * const el)
   {
   	int status   = 0;
  @@ -192,9 +197,7 @@
   		.syntax_version = "2.0",
   		.main = remove_main_ver2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -204,9 +207,7 @@
   		.syntax_version = "3.0",
   		.main = remove_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -216,9 +217,7 @@
   		.syntax_version = "3.1",
   		.main = remove_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -226,13 +225,12 @@
   		.name = "remove",
   		.description = "Remove files",
   		.syntax_version = "3.2",
  -		.parameters = remove_parameters_ver3_2,
  +		.parameters = remove_parameters_v3_2,
  +		.attributes = remove_attributes_v3_2,
   		.main = remove_main_ver3_2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.18      +7 -9      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- search_replace.c	23 Feb 2004 21:19:35 -0000	1.17
  +++ search_replace.c	24 Feb 2004 02:25:34 -0000	1.18
  @@ -217,7 +217,10 @@
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", NULL };
  +static const struct handler_attribute search_replace_attributes[] = {
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
   
   static int search_replace_main_ver3(element_s * const el)
   {
  @@ -247,9 +250,7 @@
   		.parameters = search_replace_parameters_ver2,
   		.main = search_replace_main_ver2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -258,11 +259,10 @@
   		.description = "Search and replace",
   		.syntax_version = "3.0",
   		.parameters = search_replace_parameters_ver3,
  +		.attributes = search_replace_attributes,
   		.main = search_replace_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -271,11 +271,10 @@
   		.description = "Search and replace",
   		.syntax_version = "3.1",
   		.parameters = search_replace_parameters_ver3,
  +		.attributes = search_replace_attributes,
   		.main = search_replace_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -284,12 +283,11 @@
   		.description = "Search and replace",
   		.syntax_version = "3.2",
   		.parameters = search_replace_parameters_ver3,
  +		.attributes = search_replace_attributes,
   		.main = search_replace_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
   		.alternate_shell = 1,
  -		.priority = 0
   	},
   #endif
   	{
  
  
  
  1.15      +5 -0      ALFS/nALFS/src/handlers/setenv.c
  
  Index: setenv.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/setenv.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- setenv.c	23 Feb 2004 21:19:35 -0000	1.14
  +++ setenv.c	24 Feb 2004 02:25:34 -0000	1.15
  @@ -114,6 +114,11 @@
   	{ .name = NULL }
   };
   
  +static const struct handler_attribute setenv_attributes[] = {
  +	{ .name = "mode" },
  +	{ .name = NULL }
  +};
  +
   static int setenv_main(element_s * const el)
   {
   	int i;
  
  
  
  1.14      +6 -4      ALFS/nALFS/src/handlers/stamp.c
  
  Index: stamp.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/stamp.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- stamp.c	21 Feb 2004 19:03:32 -0000	1.13
  +++ stamp.c	24 Feb 2004 02:25:34 -0000	1.14
  @@ -37,7 +37,11 @@
   
   #if HANDLER_SYNTAX_2_0
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "name", "version" };
  +static const struct handler_attribute stamp_attributes[] = {
  +	{ .name = "name" },
  +	{ .name = "version" },
  +	{ .name = NULL }
  +};
   
   static int stamp_main(element_s * const el)
   {
  @@ -75,9 +79,7 @@
   		.syntax_version = "3.0",
   		.main = stamp_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
  -		.is_action = 0,
  -		.priority = 0
  +		.attributes = stamp_attributes,
   	},
   #endif
   	{
  
  
  
  1.17      +5 -4      ALFS/nALFS/src/handlers/su.c
  
  Index: su.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/su.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- su.c	21 Feb 2004 19:03:32 -0000	1.16
  +++ su.c	24 Feb 2004 02:25:34 -0000	1.17
  @@ -138,7 +138,10 @@
   }
   
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "user", NULL };
  +static const struct handler_attribute su_attributes[] = {
  +	{ .name = "user" },
  +	{ .name = NULL }
  +};
   
   static int su_main(element_s * const el)
   {
  @@ -214,9 +217,7 @@
   		.syntax_version = "2.0",
   		.main = su_main,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
  -		.is_action = 0,
  -		.priority = 0
  +		.attributes = su_attributes,
   	},
   #endif
   	{
  
  
  
  1.19      +19 -12    ALFS/nALFS/src/handlers/textdump.c
  
  Index: textdump.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/textdump.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- textdump.c	23 Feb 2004 21:19:35 -0000	1.18
  +++ textdump.c	24 Feb 2004 02:25:34 -0000	1.19
  @@ -110,14 +110,17 @@
   
   #if HANDLER_SYNTAX_2_0
   
  -static const struct handler_parameter textdump_parameters_ver2[] = {
  +static const struct handler_parameter textdump_parameters_v2[] = {
   	{ .name = "base" },
   	{ .name = "file" },
   	{ .name = "content" },
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "mode", NULL };
  +static const struct handler_attribute textdump_attributes_v2[] = {
  +	{ .name = "mode" },
  +	{ .name = NULL }
  +};
   
   static int textdump_main_ver2(element_s * const el)
   {
  @@ -136,13 +139,17 @@
   
   #if HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 || HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter textdump_parameters_ver3[] = {
  +static const struct handler_parameter textdump_parameters_v3[] = {
   	{ .name = "file" },
   	{ .name = "content" },
   	{ .name = NULL }
   };
   
  -// char *HANDLER_SYMBOL(attributes)[] = { "base", "mode", NULL };
  +static const struct handler_attribute textdump_attributes_v3[] = {
  +	{ .name = "base" },
  +	{ .name = "mode" },
  +	{ .name = NULL }
  +};
   
   static int textdump_main_ver3(element_s * const el)
   {
  @@ -180,12 +187,12 @@
   		.name = "textdump",
   		.description = "Dump text",
   		.syntax_version = "2.0",
  -		.parameters = textdump_parameters_ver2,
  +		.parameters = textdump_parameters_v2,
  +		.attributes = textdump_attributes_v2,
   		.main = textdump_main_ver2,
   		.type = HTYPE_TEXTDUMP,
   		.alloc_data = textdump_data,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -193,12 +200,12 @@
   		.name = "textdump",
   		.description = "Dump text",
   		.syntax_version = "3.0",
  -		.parameters = textdump_parameters_ver3,
  +		.parameters = textdump_parameters_v3,
  +		.attributes = textdump_attributes_v3,
   		.main = textdump_main_ver3,
   		.type = HTYPE_TEXTDUMP,
   		.alloc_data = textdump_data,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -206,12 +213,12 @@
   		.name = "textdump",
   		.description = "Dump text",
   		.syntax_version = "3.1",
  -		.parameters = textdump_parameters_ver3,
  +		.parameters = textdump_parameters_v3,
  +		.attributes = textdump_attributes_v3,
   		.main = textdump_main_ver3,
   		.type = HTYPE_TEXTDUMP,
   		.alloc_data = textdump_data,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -219,12 +226,12 @@
   		.name = "textdump",
   		.description = "Dump text",
   		.syntax_version = "3.2",
  -		.parameters = textdump_parameters_ver3,
  +		.parameters = textdump_parameters_v3,
  +		.attributes = textdump_attributes_v3,
   		.main = textdump_main_ver3,
   		.type = HTYPE_TEXTDUMP,
   		.alloc_data = textdump_data,
   		.is_action = 1,
  -		.priority = 0,
   		.alternate_shell = 1,
   	},
   #endif
  
  
  
  1.24      +8 -10     ALFS/nALFS/src/handlers/unpack.c
  
  Index: unpack.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/unpack.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- unpack.c	23 Feb 2004 21:19:35 -0000	1.23
  +++ unpack.c	24 Feb 2004 02:25:34 -0000	1.24
  @@ -260,13 +260,18 @@
   
   #if HANDLER_SYNTAX_3_2
   
  -static const struct handler_parameter unpack_parameters_ver3_2[] = {
  +static const struct handler_parameter unpack_parameters_v3_2[] = {
   	{ .name = "archive" },
   	{ .name = "digest" },
   	{ .name = "reference" },
   	{ .name = NULL }
   };
   
  +static const struct handler_attribute unpack_attributes_v3_2[] = {
  +	{ .name = "base" },
  +	{ .name = NULL }
  +};
  +
   static int unpack_main_ver3_2(element_s * const el)
   {
   	int status = -1;
  @@ -368,9 +373,7 @@
   		.parameters = unpack_parameters_ver2,
   		.main = unpack_main_ver2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -381,9 +384,7 @@
   		.parameters = unpack_parameters_ver3,
   		.main = unpack_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -394,9 +395,7 @@
   		.parameters = unpack_parameters_ver3,
   		.main = unpack_main_ver3,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -404,12 +403,11 @@
   		.name = "unpack",
   		.description = "Unpack",
   		.syntax_version = "3.2",
  -		.parameters = unpack_parameters_ver3_2,
  +		.parameters = unpack_parameters_v3_2,
  +		.attributes = unpack_attributes_v3_2,
   		.main = unpack_main_ver3_2,
   		.type = HTYPE_NORMAL,
  -		.alloc_data = NULL,
   		.is_action = 1,
  -		.priority = 0,
   		.alternate_shell = 1,
   	},
   #endif
  
  
  



More information about the alfs-log mailing list