[Autosec-devel] sonar/src expand.c,1.5,1.6

[Jacob F. <ph...@us...>]

Update of /cvsroot/autosec/sonar/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32388

Modified Files:
	expand.c 
Log Message:
Added %x and %X for date and time
Fixed a bug with %t


Index: expand.c
===================================================================
RCS file: /cvsroot/autosec/sonar/src/expand.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** expand.c	10 Jun 2004 22:11:35 -0000	1.5
--- expand.c	11 Jun 2004 04:03:45 -0000	1.6
***************
*** 94,97 ****
--- 94,98 ----
                  result.curlen++;
                  print_number(port, &result);
+                 break;
              case 'T': /* hostname:portname */
                  fmtptr++;
***************
*** 192,195 ****
--- 193,206 ----
                  print_string(timebuf, &result);
                  break;
+             case 'x': /* date (mm/dd/yy) */
+                 fmtptr++;
+                 strftime(timebuf, TIMEBUF_SIZE, "%x", curtime);
+                 print_string(timebuf, &result);
+                 break;
+             case 'X': /* time (hh:mm:ss) */
+                 fmtptr++;
+                 strftime(timebuf, TIMEBUF_SIZE, "%X", curtime);
+                 print_string(timebuf, &result);
+                 break;
              default: /* unrecognized format */
                  checksize(2, &result);
***************
*** 275,280 ****
      checksize(strl+2, result);
      snprintf(result->resptr, strl+1, "%s", portnam->s_name);
!     result->curlen+=strl;
!     result->resptr+=strl;
      return strl;
  }
--- 286,291 ----
      checksize(strl+2, result);
      snprintf(result->resptr, strl+1, "%s", portnam->s_name);
!     result->curlen+=strl-1;
!     result->resptr+=strl-1;
      return strl;
  }