[dhcp-agent-commits] dhcp-agent/src dhcp-client.c,1.31,1.32 dhcp-libutil.h,1.27,1.28 dhcp-util.c,1.16,1.17

[<act...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7991

Modified Files:
	dhcp-client.c dhcp-libutil.h dhcp-util.c 
Log Message:
moved change_dir to utility code

Index: dhcp-client.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** dhcp-client.c	26 Jun 2003 23:56:42 -0000	1.31
--- dhcp-client.c	2 Jul 2003 15:18:22 -0000	1.32
***************
*** 337,355 ****
  }
  
- /* change int our working directory. */
- static void do_change_work_dir(void)
- {
-     /* Switch into our work directory */
- 
-     if(!file_permissions_are(work_dir, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)) {
-         FATAL_MESSAGE("wrong permissions on work directory: %s (use rwx only for owner)", work_dir);
-     }
- 
-     if(chdir(work_dir) < 0)
-         FATAL_MESSAGE("cannot enter work directory", work_dir);
- 
-     return;
- }
- 
  /* do client: perform dhcp client proper functions. */
  static void do_client(char *interface)
--- 337,340 ----
***************
*** 482,486 ****
  #endif                          /* HAVE_PROGNAME */
  
!     INFO_MESSAGE("(C) 2002 Thamer Al-Harbash <tm...@wh...>");
      INFO_MESSAGE("See LICENSE file for details.");
      INFO_MESSAGE(" ");
--- 467,471 ----
  #endif                          /* HAVE_PROGNAME */
  
!     INFO_MESSAGE("(C) 2003 Thamer Al-Harbash <tm...@wh...>");
      INFO_MESSAGE("See LICENSE file for details.");
      INFO_MESSAGE(" ");
***************
*** 541,545 ****
      }
  
!     do_change_work_dir();
  
      /* get interface if not specified. */
--- 526,536 ----
      }
  
!     /* if all the user wants is version information, give it to him. */
!     if(command_code == DO_VERSION) {
!         do_version(NULL);
!         exit(0);
!     }
! 
!     do_change_work_dir(work_dir);
  
      /* get interface if not specified. */

Index: dhcp-libutil.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-libutil.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** dhcp-libutil.h	26 Jun 2003 23:56:42 -0000	1.27
--- dhcp-libutil.h	2 Jul 2003 15:18:22 -0000	1.28
***************
*** 196,199 ****
--- 196,200 ----
  extern char *ip_addr_to_string(ip_addr_t ip_addr);
  extern void sleep_random(uint16_t max_sleep);
+ extern void do_change_work_dir(const char *dir);
  
  /* type check routines */

Index: dhcp-util.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-util.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dhcp-util.c	26 Jun 2003 23:56:42 -0000	1.16
--- dhcp-util.c	2 Jul 2003 15:18:22 -0000	1.17
***************
*** 587,588 ****
--- 587,603 ----
      sleep((get_random_uint16()%(max_sleep + 1)) + 1);
  }
+ 
+ /* change int our working directory. */
+ void do_change_work_dir(const char *work_dir)
+ {
+     /* Switch into our work directory */
+ 
+     if(!file_permissions_are(work_dir, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)) {
+         FATAL_MESSAGE("wrong permissions on work directory: %s (use rwx only for owner)", work_dir);
+     }
+ 
+     if(chdir(work_dir) < 0)
+         FATAL_MESSAGE("cannot enter work directory", work_dir);
+ 
+     return;
+ }