Changeset 80

Timestamp:

06.10.2002 20:00:03 (6 years ago)

Author:

tibob

Message:

Solaris port

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• source/config.h.in (modified) (1 diff)
• source/data.c (modified) (3 diffs)

trunk/HISTORY

@@ -4 +4 @@
 - pid configurable through command line [RC, looking at Loic Tortay's patch for pid configurable through configfile]
 - various minor fixes [LT, RC]
+- Sould work under solaris now
 
 Version 0.11.5pre2

trunk/source/config.h.in

@@ -66 +66 @@
 #undef __OS_OSF1__
 
+#ifdef __OS_SUNOS__
+#define LONGINTFORMAT "llu"
+#else
+#define LONGINTFORMAT "qu"
+#endif
+
 /* Timezone : Local Time, Coordinated Universal Time */
 typedef enum {UTC, local} ipfm_timezone;

trunk/source/data.c

@@ -2 +2 @@
   data.c - counts the data exchanged
  
-  (c) 1999-2001 Robert Cheramy <tibob@via.ecp.fr>
+  (c) 1999-2002 Robert Cheramy <tibob@via.ecp.fr>
   (c) 2000      Samuel Hocevar <sam@via.ecp.fr>
   (c) 1999      Andres Krapf <dae@via.ecp.fr>
   (c) 2001      Loïc Tortay & IN2P3 Computing Center <tortay@cc.ipin2p3.fr>
 
-  200010xx : sam   : - attempt to create directory if error opening logfile.
-                     - optional clearing of data
-  200010xx : tibob : optional append to logfile
+  200010 : sam   : - attempt to create directory if error opening logfile.
+                   - optional clearing of data
+  200010 : tibob : optional append to logfile
+  200210 : tibob : fix for Solaris
 
 */
@@ -303 +304 @@
     if ((NULL != he) && (strlen(he->h_name) <= 34) &&
         (strlen(he->h_name) > 0)) {
-      snprintf(pFormatedData, BufLen, "%-35s%15qu%15qu%15qu\n",
+      snprintf(pFormatedData, BufLen, "%-35s%15" LONGINTFORMAT "%15" LONGINTFORMAT "%15" LONGINTFORMAT "\n",
                he->h_name,
                pData->in, 
@@ -315 +316 @@
     char *res;
     res = inet_ntoa(addr);
-      snprintf(pFormatedData, BufLen, "%-35s%15qu%15qu%15qu\n",
+      snprintf(pFormatedData, BufLen, "%-35s%15" LONGINTFORMAT "%15" LONGINTFORMAT "%15" LONGINTFORMAT "\n",
              res,
              pData->in,