Changeset 142 in MondoRescue for trunk/mondo/mondo

Timestamp:

Nov 27, 2005, 10:38:41 PM (18 years ago)

Author:

bcornec

Message:

merge -r139:141 $SVN_M/branches/2.05
splint improvements (begin)

Location:

trunk/mondo/mondo

Files:

• common/libmondo-fifo.c (modified) (2 diffs)
• common/libmondo-files.c (modified) (1 diff)
• common/my-stuff.h (modified) (2 diffs)
• mondoarchive/main.c (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (1 diff)
• mondorestore/mondo-restore.c (modified) (1 diff)
• mondorestore/mondo-rstr-compare.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

trunk/mondo/mondo/common/libmondo-fifo.c

@@ -9 +9 @@
 #include <unistd.h>
 #include <stdio.h>
+#ifndef S_SPLINT_S
 #include <signal.h>
+#endif
 #include <fcntl.h>
 #include <stdio.h>
@@ -20 +22 @@
 #include <sys/sem.h>
 #include <sys/wait.h>
+#ifndef S_SPLINT_S
 #include <pthread.h>
+#endif
 
 #include "my-stuff.h"

trunk/mondo/mondo/common/libmondo-files.c

@@ -1233 +1233 @@
     }
     fprintf(fout, "ifconfig lo 127.0.0.1  # config loopback\n");
-    fprintf(fout, "ifconfig %s %s; # config client\n", nfs_dev,
+    fprintf(fout, "ifconfig %s %s # config client\n", nfs_dev,
             nfs_client_ipaddr);
-    fprintf(fout, "ping -c 1 %s; # ping server\n", nfs_server_ipaddr);
+    fprintf(fout, "ping -c 1 %s # ping server\n", nfs_server_ipaddr);
     fprintf(fout, "mount -t nfs -o nolock %s /tmp/isodir\n",
             bkpinfo->nfs_mount);

trunk/mondo/mondo/common/my-stuff.h

@@ -61 +61 @@
 #include <time.h>
 #include <unistd.h>
+#ifndef S_SPLINT_S
 #include <signal.h>
+#endif
 //#include <curses.h>
 #include <newt.h>
 #include <ctype.h>
 #include <string.h>
+#ifndef S_SPLINT_S
 #include <pthread.h>
+#endif
 #include <assert.h>
 
@@ -338 +342 @@
 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
 #define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
-#define SANE_FORMATS        "swap image vfat ext2 ext3 xfs vfs jfs reiserfs dos minix coda nfs ntfs hpfs raid lvm"
+#define SANE_FORMATS        "swap image vfat ext2 ext3 xfs vfs jfs reiserfs dos minix coda nfs ntfs hpfs raid lvm cifs"
 #define ALT_TAPE        "/dev/ht0"
 #define MKE2FS_OR_NEWFS "mke2fs"

trunk/mondo/mondo/mondoarchive/main.c

@@ -108 +108 @@
 
 /************************* #include statements *************************/
+#ifndef S_SPLINT_S
 #include <pthread.h>
+#endif
 //#include <config.h>
 //#include "../../config.h"

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -165 +165 @@
 #include "mondo-cli-EXT.h"
 #include "../common/libmondo.h"
+#ifndef S_SPLINT_S
 #include <pthread.h>
+#endif
 
 #ifndef VERSION

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -388 +388 @@
 #include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
+#ifndef S_SPLINT_S
 #include <pthread.h>
+#endif
 
 extern void success_message(void);

trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

@@ -63 +63 @@
 #include "mondo-restore-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
+#ifndef S_SPLINT_S
 #include <pthread.h>
+#endif
 
 //static char cvsid[] = "$Id$";

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -131 +131 @@
 //#include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools.h"
+#ifndef S_SPLINT_S
 #include <pthread.h>
+#endif
 
 extern bool g_sigpipe_caught;