svn commit: samba r7817 - in branches/SAMBA_3_0/source/libsmb: .

[derrell at samba.org]

Author: derrell
Date: 2005-06-21 20:34:24 +0000 (Tue, 21 Jun 2005)
New Revision: 7817

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7817

Log:
Eliminate use of ctime_r() in libsmbclient DEBUG statement.  It seems that
ctime_r() takes different parameters on Solaris than it does on Linux, and
it's easier to just eliminate the use of it than to write a configure test.


Modified:
   branches/SAMBA_3_0/source/libsmb/libsmbclient.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-06-21 20:22:38 UTC (rev 7816)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-06-21 20:34:24 UTC (rev 7817)
@@ -3017,14 +3017,26 @@
                 m_time = tbuf[1].tv_sec;
         }
 
+        if (DEBUGLVL(4)) 
         {
+                char *p;
                 char atimebuf[32];
                 char mtimebuf[32];
 
-                DEBUG(4, ("smbc_utimes(%s, atime = %s mtime = %s)\n",
-                          fname,
-                          ctime_r(&a_time, atimebuf),
-                          ctime_r(&m_time, mtimebuf)));
+                strncpy(atimebuf, ctime(&a_time), sizeof(atimebuf));
+                atimebuf[sizeof(atimebuf) - 1] = '\0';
+                if ((p = strchr(atimebuf, '\n')) != NULL) {
+                        *p = '\0';
+                }
+
+                strncpy(mtimebuf, ctime(&m_time), sizeof(mtimebuf));
+                mtimebuf[sizeof(mtimebuf) - 1] = '\0';
+                if ((p = strchr(mtimebuf, '\n')) != NULL) {
+                        *p = '\0';
+                }
+
+                dbgtext("smbc_utimes(%s, atime = %s mtime = %s)\n",
+                        fname, atimebuf, mtimebuf);
         }
 
 	if (smbc_parse_path(context, fname,