[Dhcp-agent-commits] CVS: dhcp-agent TODO,1.19,1.20 acinclude.m4,1.4,1.5 aclocal.m4,1.4,1.5 configure,1.15,1.16 dhcp-agent.h,1.47,1.48 dhcp-cache-entry.c,1.3,1.4

[Thamer Al-H. <act...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv21360

Modified Files:
	TODO acinclude.m4 aclocal.m4 configure dhcp-agent.h 
	dhcp-cache-entry.c 
Log Message:
fix for peculiar openbsd sh escaping of \\

Index: TODO
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/TODO,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** TODO	5 Jun 2002 13:08:36 -0000	1.19
--- TODO	6 Jun 2002 03:25:04 -0000	1.20
***************
*** 17,21 ****
  -- autoconf script is getting ugly -- methinks its broken and is
     barely parsed
- 
  -- add test for kill(0, pid) to see if it correctly identifies the
     running process.
--- 17,20 ----

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/acinclude.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** acinclude.m4	5 Jun 2002 12:59:57 -0000	1.4
--- acinclude.m4	6 Jun 2002 03:25:04 -0000	1.5
***************
*** 97,101 ****
  
          if(size_table[i] == size) {
!             fprintf(fp, "#define %s \"%s\"\n", sub_string, sub_table[i]);
              break;
          }
--- 97,101 ----
  
          if(size_table[i] == size) {
!             fprintf(fp, "#define %s \\"%s\\"\n", sub_string, sub_table[i]);
              break;
          }
***************
*** 111,115 ****
          fprintf(stderr, "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n");
  
!         fprintf(fp, "#define %s \"%s\"\n", sub_string, sub_table[0]);
      }
  
--- 111,115 ----
          fprintf(stderr, "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n");
  
!         fprintf(fp, "#define %s \\"%s\\"\n", sub_string, sub_table[0]);
      }
  

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/aclocal.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aclocal.m4	5 Jun 2002 12:59:57 -0000	1.4
--- aclocal.m4	6 Jun 2002 03:25:04 -0000	1.5
***************
*** 109,113 ****
  
          if(size_table[i] == size) {
!             fprintf(fp, "#define %s \"%s\"\n", sub_string, sub_table[i]);
              break;
          }
--- 109,113 ----
  
          if(size_table[i] == size) {
!             fprintf(fp, "#define %s \\"%s\\"\n", sub_string, sub_table[i]);
              break;
          }
***************
*** 123,127 ****
          fprintf(stderr, "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n");
  
!         fprintf(fp, "#define %s \"%s\"\n", sub_string, sub_table[0]);
      }
  
--- 123,127 ----
          fprintf(stderr, "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n");
  
!         fprintf(fp, "#define %s \\"%s\\"\n", sub_string, sub_table[0]);
      }
  

Index: configure
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** configure	5 Jun 2002 12:59:57 -0000	1.15
--- configure	6 Jun 2002 03:25:04 -0000	1.16
***************
*** 2470,2474 ****
  
          if(size_table[i] == size) {
!             fprintf(fp, "#define %s \"%s\"\n", sub_string, sub_table[i]);
              break;
          }
--- 2470,2474 ----
  
          if(size_table[i] == size) {
!             fprintf(fp, "#define %s \\"%s\\"\n", sub_string, sub_table[i]);
              break;
          }
***************
*** 2484,2488 ****
          fprintf(stderr, "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n");
  
!         fprintf(fp, "#define %s \"%s\"\n", sub_string, sub_table[0]);
      }
  
--- 2484,2488 ----
          fprintf(stderr, "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n");
  
!         fprintf(fp, "#define %s \\"%s\\"\n", sub_string, sub_table[0]);
      }
  

Index: dhcp-agent.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-agent.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** dhcp-agent.h	5 Jun 2002 13:08:36 -0000	1.47
--- dhcp-agent.h	6 Jun 2002 03:25:04 -0000	1.48
***************
*** 322,338 ****
  } rawnet_t;
  
- /* Cache data types. */
- 
- typedef struct {
-     char *name;
-     char *value;
- } cache_entry_t;
- 
- typedef struct {
-     char *interface; /* points to dhcp_client_control->interface */
-     list_t *vars;
- } client_cache_t;
- 
- 
  typedef struct {
      char *conf_file;
--- 322,325 ----
***************
*** 802,828 ****
  extern void error_log(char *msg);
  extern void info_log(char *msg);
- 
- /* dhcp cache obj */
- 
- extern client_cache_t *create_client_cache(dhcp_client_control_t *dc);
- extern void client_cache_destroy(client_cache_t *cc);
- extern int load_client_cache(client_cache_t *dc, unsigned char use_tmp);
- extern int client_cache_is_empty(client_cache_t *cc);
- extern void purge_cache(client_cache_t *cc);
- extern int client_cache_dump_options(client_cache_t *cc, list_t *options);
- extern list_t *client_cache_load_option_network_list(client_cache_t *cc, 
-                                                      unsigned char use_temp);
- extern list_t *client_cache_load_option_string_list(client_cache_t *cc,
-                                                     unsigned char use_tmp);
- 
- extern void client_cache_update(client_cache_t *cc);
- extern void client_cache_delete_cache(client_cache_t *cc);
- extern void client_cache_delete_tmp_cache(client_cache_t *cc);
- 
- /* cache entry obj */
- 
- extern cache_entry_t *make_cache_entry(char *name, char *value);
- extern void destroy_cache_entry(cache_entry_t *cache);
- extern void cache_entry_purge_list(list_t *cache_list);
  
  /* dhcp client control */
--- 789,792 ----

Index: dhcp-cache-entry.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-cache-entry.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dhcp-cache-entry.c	3 Feb 2002 16:56:00 -0000	1.3
--- dhcp-cache-entry.c	6 Jun 2002 03:25:04 -0000	1.4
***************
*** 28,31 ****
--- 28,32 ----
  
  #include <dhcp-agent.h>
+ #include <dhcp-cache.h>
  
  /* constructors. */