[dhcp-agent-commits] dhcp-agent/src dhcp-client-control.c,1.8,1.9 dhcp-libutil.h,1.14,1.15 dhcp-stringbuffer.c,1.7,1.8 dhcp-util.c,1.9,1.10

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

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

Modified Files:
	dhcp-client-control.c dhcp-libutil.h dhcp-stringbuffer.c 
	dhcp-util.c 
Log Message:
fixed up error message handling

Index: dhcp-client-control.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-control.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dhcp-client-control.c	19 Dec 2002 03:11:45 -0000	1.8
--- dhcp-client-control.c	21 Dec 2002 16:51:53 -0000	1.9
***************
*** 143,147 ****
      dc->conf = create_client_conf(dc->interface);
      if(dc->conf == NULL) {
!         ERROR_MESSAGE("could not read client conf.");
          dhcp_client_control_destroy(dc);
          return NULL;
--- 143,147 ----
      dc->conf = create_client_conf(dc->interface);
      if(dc->conf == NULL) {
!         ERROR_MESSAGE("while reading client conf.");
          dhcp_client_control_destroy(dc);
          return NULL;

Index: dhcp-libutil.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-libutil.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dhcp-libutil.h	21 Dec 2002 16:26:56 -0000	1.14
--- dhcp-libutil.h	21 Dec 2002 16:51:53 -0000	1.15
***************
*** 212,216 ****
  extern void stringbuffer_clear(stringbuffer * sb);
  extern const char *stringbuffer_getnextline(stringbuffer * sb, const char *cptr);
! extern void stringbuffer_marknewlines(stringbuffer * sb);
  extern void stringbuffer_set(stringbuffer * dest, const char *s);
  extern void stringbuffer_align(stringbuffer * sb, int begin, int end);
--- 212,216 ----
  extern void stringbuffer_clear(stringbuffer * sb);
  extern const char *stringbuffer_getnextline(stringbuffer * sb, const char *cptr);
! extern int stringbuffer_marknewlines(stringbuffer * sb);
  extern void stringbuffer_set(stringbuffer * dest, const char *s);
  extern void stringbuffer_align(stringbuffer * sb, int begin, int end);
***************
*** 289,293 ****
  
  /* Line length for messages before breaking into a new line. */
! #define MESSAGE_LINE_LENGTH 60
  
  /* timeout as per rfc2131 */
--- 289,293 ----
  
  /* Line length for messages before breaking into a new line. */
! #define MESSAGE_LINE_LENGTH 70
  
  /* timeout as per rfc2131 */

Index: dhcp-stringbuffer.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-stringbuffer.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dhcp-stringbuffer.c	19 Dec 2002 17:20:23 -0000	1.7
--- dhcp-stringbuffer.c	21 Dec 2002 16:51:53 -0000	1.8
***************
*** 424,430 ****
   * null terminators inside of them.
   */
! void stringbuffer_marknewlines(stringbuffer * sb)
  {
      char *c;
  
      /* first append one null termination to the end
--- 424,431 ----
   * null terminators inside of them.
   */
! int stringbuffer_marknewlines(stringbuffer * sb)
  {
      char *c;
+     int newline_count = 0;
  
      /* first append one null termination to the end
***************
*** 436,441 ****
      while(1) {
  
!         if(*c == '\n')
              *c = 0;
  
          c++;
--- 437,444 ----
      while(1) {
  
!         if(*c == '\n') {
!             newline_count++;
              *c = 0;
+         }
  
          c++;
***************
*** 444,448 ****
      }
  
!     return;
  }
  
--- 447,451 ----
      }
  
!     return newline_count; /* return our line count. */
  }
  

Index: dhcp-util.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-util.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dhcp-util.c	19 Dec 2002 03:11:45 -0000	1.9
--- dhcp-util.c	21 Dec 2002 16:51:53 -0000	1.10
***************
*** 86,98 ****
  
      stringbuffer_avprintf(msg_sb, fmt, ap);
!     stringbuffer_align(msg_sb, 0, MESSAGE_LINE_LENGTH - stringbuffer_getlen(prefix_sb));
      stringbuffer_marknewlines(msg_sb);
  
      if(interactive == 1) {
          while((ptr = stringbuffer_getnextline(msg_sb, ptr)) != NULL)
!             fprintf(stderr, "%s : %s%s\n", getprogname(), stringbuffer_getstring(prefix_sb), ptr);
      } else {
          while((ptr = stringbuffer_getnextline(msg_sb, ptr)) != NULL)
              error_log(ptr);
      }
  
--- 86,105 ----
  
      stringbuffer_avprintf(msg_sb, fmt, ap);
!     stringbuffer_align(msg_sb, 10, MESSAGE_LINE_LENGTH - strlen(getprogname()));
      stringbuffer_marknewlines(msg_sb);
  
      if(interactive == 1) {
+ 
+         if(stringbuffer_getlen(prefix_sb)) /* only print prefix on first line if it is available. */
+             fprintf(stderr, "%s : %s\n", getprogname(), stringbuffer_getstring(prefix_sb));
+ 
          while((ptr = stringbuffer_getnextline(msg_sb, ptr)) != NULL)
!                 fprintf(stderr, "%s : %s\n", getprogname(), ptr);
! 
      } else {
+ 
          while((ptr = stringbuffer_getnextline(msg_sb, ptr)) != NULL)
              error_log(ptr);
+ 
      }