Merge pull request #232 from michaelforney/misc-fixes

Minor portability fixes

Author: keszybz

meson.build

@@ -4,7 +4,7 @@ project('casync', 'c',
         version : '2',
         license : 'LGPLv2+',
         default_options: [
-                'c_std=gnu99',
+                'c_std=gnu11',
                 'prefix=/usr',
                 'sysconfdir=/etc',
                 'localstatedir=/var',

src/canbd.c

@@ -3,10 +3,10 @@
 #include <fcntl.h>
 #include <linux/fs.h>
 #include <linux/nbd.h>
+#include <poll.h>
 #include <stddef.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
-#include <sys/poll.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>

src/caremote.c

@@ -2,8 +2,8 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <stddef.h>
-#include <sys/poll.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
 

src/casync.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/stat.h>
 
 #include "cacache.h"

src/util.c

@@ -2,8 +2,9 @@
 
 #include <ctype.h>
 #include <fcntl.h>
+#include <libgen.h>
+#include <poll.h>
 #include <stdarg.h>
-#include <sys/poll.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <time.h>
@@ -15,12 +16,6 @@
 #  include <sys/random.h>
 #endif
 
-/* When we include libgen.h because we need dirname() we immediately
- * undefine basename() since libgen.h defines it as a macro to the
- * POSIX version which is really broken. We prefer GNU basename(). */
-#include <libgen.h>
-#undef basename
-
 #include "def.h"
 #include "time-util.h"
 #include "util.h"
@@ -482,7 +477,8 @@ int tempfn_random(const char *p, char **ret) {
          *         /foo/bar/.#waldobaa2a261115984a9
          */
 
-        fn = basename(p);
+        fn = strrchr(p, '/');
+        fn = fn ? fn + 1 : p;
         if (!filename_is_valid(fn))
                 return -EINVAL;
 

test/notify-wait.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
+#include <poll.h>
 #include <signal.h>
 #include <stddef.h>
-#include <sys/poll.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>

test/test-caencoder.c

@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "cadecoder.h"