fix crash in mount/export

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

diff --git a/examples/nfsclient-sync.c b/examples/nfsclient-sync.c
index a6794ee2dfa05ae496981c72a8fbc9f39b5d6ea4..a5af3ce73d19c40db030337eb33a8c05ad94b998 100644 (file)
--- a/examples/nfsclient-sync.c
+++ b/examples/nfsclient-sync.c
@@ -20,7 +20,7 @@
 
 #define SERVER "10.1.1.27"
 #define EXPORT "/VIRTUAL"
-#define NFSFILE "/BOOKS/Classics/Dracula.djvu"
+#define NFSFILE "/BOOKS/Classics/Dracula.djvu.truncated"
 #define NFSFILER "/BOOKS/Classics/Dracula.djvu.renamed"
 #define NFSFILEW "/BOOKS/Classics/foo"
 #define NFSDIR "/BOOKS/Classics/"
@@ -35,6 +35,8 @@
 #include <fcntl.h>
 #include "libnfs.h"
 #include <rpc/rpc.h>            /* for authunix_create() */
+#include "libnfs-raw.h"
+#include "libnfs-raw-mount.h"
 
 struct client {
        char *server;
@@ -44,6 +46,8 @@ struct client {
 };
 
 
+char buf[5*1024*1024];
+
 int main(int argc _U_, char *argv[] _U_)
 {
        struct nfs_context *nfs;
@@ -56,9 +60,23 @@ int main(int argc _U_, char *argv[] _U_)
        client.server = SERVER;
        client.export = EXPORT;
        client.is_finished = 0;
-       char buf[16];
        off_t offset;
        struct statvfs svfs;
+       exports export, tmp;
+
+       export = mount_getexports(SERVER);
+       if (export != NULL) {
+               printf("exports on server %s\n", SERVER);
+               tmp = export;
+               while (tmp != NULL) {
+                     printf("Export: %s\n", tmp->ex_dir);
+                     tmp = tmp->ex_next;
+               }
+
+               mount_free_export_list(export);
+       } else {
+               printf("no exports on server %s\n", SERVER);
+       }       
 
        nfs = nfs_init_context();
        if (nfs == NULL) {
@@ -66,15 +84,15 @@ int main(int argc _U_, char *argv[] _U_)
                exit(10);
        }
 
-       ret = nfs_mount_sync(nfs, client.server, client.export);
+       ret = nfs_mount(nfs, client.server, client.export);
        if (ret != 0) {
                printf("Failed to mount nfs share : %s\n", nfs_get_error(nfs));
                exit(10);
        }
-       printf("mounted share successfully\n");
+       printf("mounted share successfully %s\n", nfs_get_error(nfs));
 
 
-       ret = nfs_stat_sync(nfs, NFSFILE, &st);
+       ret = nfs_stat(nfs, NFSFILE, &st);
        if (ret != 0) {
                printf("Failed to stat(%s) %s\n", NFSFILE, nfs_get_error(nfs));
                exit(10);
@@ -83,13 +101,14 @@ int main(int argc _U_, char *argv[] _U_)
        printf("Size %d\n", (int)st.st_size);
        printf("Inode %04o\n", (int)st.st_ino);
 
-       ret = nfs_open_sync(nfs, NFSFILE, O_RDONLY, &nfsfh);
+       ret = nfs_open(nfs, NFSFILE, O_RDONLY, &nfsfh);
        if (ret != 0) {
                printf("Failed to open(%s) %s\n", NFSFILE, nfs_get_error(nfs));
                exit(10);
        }
 
-       ret = nfs_read_sync(nfs, nfsfh, 16, buf);
+#if 0
+       ret = nfs_read(nfs, nfsfh, 16, buf);
        if (ret < 0) {
                printf("Failed to pread(%s) %s\n", NFSFILE, nfs_get_error(nfs));
                exit(10);
@@ -99,7 +118,8 @@ int main(int argc _U_, char *argv[] _U_)
                printf("%02x ", buf[i]&0xff);
        }
        printf("\n");
-       ret = nfs_read_sync(nfs, nfsfh, 16, buf);
+#endif
+       ret = nfs_read(nfs, nfsfh, sizeof(buf), buf);
        if (ret < 0) {
                printf("Failed to pread(%s) %s\n", NFSFILE, nfs_get_error(nfs));
                exit(10);
@@ -110,7 +130,7 @@ int main(int argc _U_, char *argv[] _U_)
        }
        printf("\n");
 
-       ret = (int)nfs_lseek_sync(nfs, nfsfh, 0, SEEK_CUR, &offset);
+       ret = (int)nfs_lseek(nfs, nfsfh, 0, SEEK_CUR, &offset);
        if (ret < 0) {
                printf("Failed to lseek(%s) %s\n", NFSFILE, nfs_get_error(nfs));
                exit(10);
@@ -118,14 +138,14 @@ int main(int argc _U_, char *argv[] _U_)
        printf("File position is %d\n", (int)offset);
 
        printf("seek to end of file\n");
-       ret = (int)nfs_lseek_sync(nfs, nfsfh, 0, SEEK_END, &offset);
+       ret = (int)nfs_lseek(nfs, nfsfh, 0, SEEK_END, &offset);
        if (ret < 0) {
                printf("Failed to lseek(%s) %s\n", NFSFILE, nfs_get_error(nfs));
                exit(10);
        }
        printf("File position is %d\n", (int)offset);
 
-       ret = nfs_fstat_sync(nfs, nfsfh, &st);
+       ret = nfs_fstat(nfs, nfsfh, &st);
        if (ret != 0) {
                printf("Failed to stat(%s) %s\n", NFSFILE, nfs_get_error(nfs));
                exit(10);
@@ -135,13 +155,13 @@ int main(int argc _U_, char *argv[] _U_)
        printf("Inode %04o\n", (int)st.st_ino);
 
 
-       ret = nfs_close_sync(nfs, nfsfh);
+       ret = nfs_close(nfs, nfsfh);
        if (ret < 0) {
                printf("Failed to close(%s): %s\n", NFSFILE, nfs_get_error(nfs));
                exit(10);
        }
 
-       ret = nfs_opendir_sync(nfs, NFSDIR, &nfsdir);
+       ret = nfs_opendir(nfs, NFSDIR, &nfsdir);
        if (ret != 0) {
                printf("Failed to open(%s) %s\n", NFSFILE, nfs_get_error(nfs));
                exit(10);
@@ -152,29 +172,29 @@ int main(int argc _U_, char *argv[] _U_)
        nfs_closedir(nfs, nfsdir);
 
 
-       ret = nfs_open_sync(nfs, NFSFILEW, O_WRONLY, &nfsfh);
+       ret = nfs_open(nfs, NFSFILEW, O_WRONLY, &nfsfh);
        if (ret != 0) {
                printf("Failed to open(%s) %s\n", NFSFILEW, nfs_get_error(nfs));
                exit(10);
        }
-       ret = nfs_pwrite_sync(nfs, nfsfh, 0, 16, buf);
+       ret = nfs_pwrite(nfs, nfsfh, 0, 16, buf);
        if (ret < 0) {
                printf("Failed to pwrite(%s) %s\n", NFSFILEW, nfs_get_error(nfs));
                exit(10);
        }
-       ret = nfs_fsync_sync(nfs, nfsfh);
+       ret = nfs_fsync(nfs, nfsfh);
        if (ret < 0) {
                printf("Failed to fsync(%s) %s\n", NFSFILEW, nfs_get_error(nfs));
                exit(10);
        }
-       ret = nfs_close_sync(nfs, nfsfh);
+       ret = nfs_close(nfs, nfsfh);
        if (ret < 0) {
                printf("Failed to close(%s) %s\n", NFSFILEW, nfs_get_error(nfs));
                exit(10);
        }
 
 
-       ret = nfs_statvfs_sync(nfs, NFSDIR, &svfs);
+       ret = nfs_statvfs(nfs, NFSDIR, &svfs);
        if (ret < 0) {
                printf("Failed to statvfs(%s) %s\n", NFSDIR, nfs_get_error(nfs));
                exit(10);
@@ -182,7 +202,7 @@ int main(int argc _U_, char *argv[] _U_)
        printf("files %d/%d/%d\n", (int)svfs.f_files, (int)svfs.f_ffree, (int)svfs.f_favail);
 
 
-       ret = nfs_access_sync(nfs, NFSFILE, R_OK);
+       ret = nfs_access(nfs, NFSFILE, R_OK);
        if (ret != 0) {
                printf("Failed to access(%s) %s\n", NFSFILE, nfs_get_error(nfs));
        }
@@ -190,7 +210,7 @@ int main(int argc _U_, char *argv[] _U_)
        /* become root */
        nfs_set_auth(nfs, authunix_create("Ronnies-Laptop", 0, 0, 0, NULL));
 
-       ret = nfs_link_sync(nfs, NFSFILE, NFSFILER);
+       ret = nfs_link(nfs, NFSFILE, NFSFILER);
        if (ret != 0) {
                printf("Failed to link(%s) %s\n", NFSFILE, nfs_get_error(nfs));
        }
@@ -200,3 +220,4 @@ int main(int argc _U_, char *argv[] _U_)
        printf("nfsclient finished\n");
        return 0;
 }
+