ZDR: remove dependency on zdr.h from the examples and nfs-ls

[deb_libnfs.git] / examples / nfsclient-sync.c

diff --git a/examples/nfsclient-sync.c b/examples/nfsclient-sync.c
index e42214aab473c5b6d72bd338bb154ebeb2b72612..0985acdbf61c233e36f147d0b4d42a15b4b32b30 100644 (file)
--- a/examples/nfsclient-sync.c
+++ b/examples/nfsclient-sync.c
@@ -20,35 +20,39 @@
 
 /* Example program using the highlevel sync interface
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+ 
 #ifdef WIN32
 #include "win32_compat.h"
+#pragma comment(lib, "ws2_32.lib")
+WSADATA wsaData;
+#define PRId64 "ll"
 #else
+#include <inttypes.h>
 #include <string.h>
-#include <fcntl.h>
 #include <sys/stat.h>
+#ifndef AROS
 #include <sys/statvfs.h>
 #endif
- 
+#endif
 
-#if defined(WIN32)
-#pragma comment(lib, "ws2_32.lib")
-WSADATA wsaData;
-#else
-#include <sys/statvfs.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <inttypes.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "libnfs-zdr.h"
 #include "libnfs.h"
-#include <rpc/rpc.h>            /* for authunix_create() */
-#include <popt.h>
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"
 
@@ -67,22 +71,6 @@ void print_usage(void)
        fprintf(stderr, "Usage: nfsclient-sync [-?|--help] [--usage] <url>\n");
 }
 
-void print_help(void)
-{
-       fprintf(stderr, "Usage: nfsclient-sync [OPTION...] <url>\n");
-       fprintf(stderr, "\n");
-       fprintf(stderr, "Help options:\n");
-       fprintf(stderr, "  -?, --help                        Show this help message\n");
-       fprintf(stderr, "      --usage                       Display brief usage message\n");
-       fprintf(stderr, "\n");
-       fprintf(stderr, "NFS URL format : nfs://<server>/<export-path>\n");
-       fprintf(stderr, "\n");
-       fprintf(stderr, "<host> is either of:\n");
-       fprintf(stderr, "  \"hostname\"       nfs.example\n");
-       fprintf(stderr, "  \"ipv4-address\"   10.1.1.27\n");
-       fprintf(stderr, "  \"ipv6-address\"   [fce0::1]\n");
-}
-
 int main(int argc, char *argv[])
 {
        struct nfs_context *nfs = NULL;
@@ -95,51 +83,21 @@ int main(int argc, char *argv[])
        struct nfsdirent *nfsdirent;
        struct statvfs svfs;
        exports export, tmp;
-       int show_help = 0, show_usage = 0;
-       poptContext pc;
-       const char **extra_argv;
-       int extra_argc = 0;
        const char *url = NULL;
        char *server = NULL, *path = NULL, *strp;
 
-       struct poptOption popt_options[] = {
-               { "help", '?', POPT_ARG_NONE, &show_help, 0, "Show this help message", NULL },
-               { "usage", 0, POPT_ARG_NONE, &show_usage, 0, "Display brief usage message", NULL },
-               POPT_TABLEEND
-       };
-
-#if defined(WIN32)
+#ifdef WIN32
        if (WSAStartup(MAKEWORD(2,2), &wsaData) != 0) {
                printf("Failed to start Winsock2\n");
                exit(10);
        }
 #endif
 
-       pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_POSIXMEHARDER);
-       if ((res = poptGetNextOpt(pc)) < -1) {
-               fprintf(stderr, "Failed to parse option : %s %s\n",
-                       poptBadOption(pc, 0), poptStrerror(res));
-               exit(10);
-       }
-       extra_argv = poptGetArgs(pc);
-       if (extra_argv) {
-               url = *extra_argv;
-               extra_argv++;
-               while (extra_argv[extra_argc]) {
-                       extra_argc++;
-               }
-       }
-       poptFreeContext(pc);
-
-       if (show_help != 0) {
-               print_help();
-               exit(0);
-       }
+#ifdef AROS
+       aros_init_socket();
+#endif
 
-       if (show_usage != 0) {
-               print_usage();
-               exit(0);
-       }
+       url = argv[1];
 
        if (url == NULL) {
                fprintf(stderr, "No URL specified.\n");
@@ -204,7 +162,7 @@ int main(int argc, char *argv[])
 
        ret = nfs_opendir(nfs, "/", &nfsdir);
        if (ret != 0) {
-               printf("Failed to opendir(\"/\")\n", nfs_get_error(nfs));
+               printf("Failed to opendir(\"/\") %s\n", nfs_get_error(nfs));
                exit(10);
        }
        while((nfsdirent = nfs_readdir(nfs, nfsdir)) != NULL) {
@@ -214,7 +172,7 @@ int main(int argc, char *argv[])
                        continue;
                }
 
-               snprintf(path, 1024, "%s/%s", "/", nfsdirent->name);
+               sprintf(path, "%s/%s", "/", nfsdirent->name);
                ret = nfs_stat(nfs, path, &st);
                if (ret != 0) {
                        fprintf(stderr, "Failed to stat(%s) %s\n", path, nfs_get_error(nfs));
@@ -222,7 +180,9 @@ int main(int argc, char *argv[])
                }
 
                switch (st.st_mode & S_IFMT) {
+#ifndef WIN32
                case S_IFLNK:
+#endif
                case S_IFREG:
                        printf("-");
                        break;
@@ -251,7 +211,7 @@ int main(int argc, char *argv[])
                        "-w"[!!(st.st_mode & S_IWOTH)],
                        "-x"[!!(st.st_mode & S_IXOTH)]
                );
-               printf(" %2d", st.st_nlink);
+               printf(" %2d", (int)st.st_nlink);
                printf(" %5d", st.st_uid);
                printf(" %5d", st.st_gid);
                printf(" %12" PRId64, st.st_size);