Skip to contentSkip to conversation

Merge nfsmount.x and mount.x into mount.x

PATCH In review Amit Gud 2 participants 2 messages Jun 22, 2006 – Jun 23, 2006

Subsystems (2)
lore
Share & tools
lore

Amit Gud

author
#0 lore raw

PATCH 1/1 Merge nfsmount.x and mount.x into mount.x

AG

Signature · 2 lines
May the source be with you.
http://www.cis.ksu.edu/~gud

Merge utils/mount/nfsmount.x and support/export/mount.x into support/export/mount.x.

---

utils/mount/Makefile.am +3 -35
diff -uprN -X dontdiff nfs-utils/utils/mount/Makefile.am nfs-utils-ag/utils/mount/Makefile.am
@@ -2,48 +2,16 @@
 
 man8_MANS	= mount.nfs.man umount.nfs.man
 
-RPCGEN	= $(top_builddir)/tools/rpcgen/rpcgen
-
-GENFILES_CLNT	= nfsmount_clnt.c
-GENFILES_XDR	= nfsmount_xdr.c
-GENFILES_H	= nfsmount.h
-
-GENFILES	= $(GENFILES_CLNT) $(GENFILES_XDR) $(GENFILES_H)
-
 sbin_PROGRAMS	= mount.nfs
 EXTRA_DIST = nfsmount.x $(man8_MANS)
 mount_nfs_SOURCES = mount.c nfsmount.c nfs4mount.c nfsumount.c \
-		  nfsmount_xdr.c mount_constants.h nfs4_mount.h nfsmount.h \
-		  nfs_mount4.h
-
-BUILT_SOURCES = $(GENFILES)
-mount_nfs_LDADD = ../../support/nfs/libnfs.a
-
-
-$(RPCGEN):
-	make -C ../../tools/rpcgen all
-
-$(GENFILES_CLNT): %_clnt.c: %.x $(RPCGEN)
-	test -f $@ && rm -rf $@ || true
-	$(RPCGEN) -l -o $@ $<
-
-$(GENFILES_SVC): %_svc.c: %.x $(RPCGEN)
-	test -f $@ && rm -rf $@ || true
-	$(RPCGEN) -m -o $@ $<
-
-$(GENFILES_XDR): %_xdr.c: %.x $(RPCGEN)
-	test -f $@ && rm -rf $@ || true
-	$(RPCGEN) -c -o $@ $<
-
-$(GENFILES_H): %.h: %.x $(RPCGEN)
-	test -f $@ && rm -rf $@ || true
-	$(RPCGEN) -h -o $@ $<
+		  mount_constants.h nfs4_mount.h nfs_mount4.h
 
+mount_nfs_LDADD = ../../support/nfs/libnfs.a \
+		  ../../support/export/libexport.a
 
 MAINTAINERCLEANFILES = Makefile.in
 
-CLEANFILES = $(GENFILES)
-
 install-exec-hook:
 	(cd $(DESTDIR)$(sbindir) && \
 	  ln -sf $(sbin_PROGRAMS) mount.nfs4 && \
utils/mount/mount.c +1 -1
diff -uprN -X dontdiff nfs-utils/utils/mount/mount.c nfs-utils-ag/utils/mount/mount.c
@@ -37,7 +37,7 @@
 #include "nfs_mount.h"
 #include "nfs4_mount.h"
 #include "nfsumount.h"
-#include "nfsmount.h"
+#include "mount.h"
 
 char *progname;
 int nomtab;
utils/mount/nfsmount.c +5 -5
diff -uprN -X dontdiff nfs-utils/utils/mount/nfsmount.c nfs-utils-ag/utils/mount/nfsmount.c
@@ -59,7 +59,7 @@
 
 #include "conn.h"
 #include "xcommon.h"
-#include "nfsmount.h"
+#include "mount.h"
 #include "nfsumount.h"
 #include "nfs_mount.h"
 #include "mount_constants.h"
@@ -1084,11 +1084,11 @@ nfsmount(const char *spec, const char *n
 		}
 #if NFS_MOUNT_VERSION >= 5
 		mountres = &mntres.nfsv3.mountres3_u.mountinfo;
-		i = mountres->auth_flavours.auth_flavours_len;
+		i = mountres->auth_flavors.auth_flavors_len;
 		if (i <= 0) 
-			goto noauth_flavours;
+			goto noauth_flavors;
 
-		flavor = mountres->auth_flavours.auth_flavours_val;
+		flavor = mountres->auth_flavors.auth_flavors_val;
 		while (--i >= 0) {
 			if (flavor[i] == data.pseudoflavor)
 				yum = 1;
@@ -1106,7 +1106,7 @@ nfsmount(const char *spec, const char *n
 			nfs_call_umount(&mnt_server, &dirname);
 			goto fail;
 		}
-noauth_flavours:
+noauth_flavors:
 #endif
 		fhandle = &mntres.nfsv3.mountres3_u.mountinfo.fhandle;
 		memset(data.old_root.data, 0, NFS_FHSIZE);
utils/mount/nfsmount.x +0 -336

336 lines not on this page · raw message

utils/mount/nfsumount.c +1 -1
diff -uprN -X dontdiff nfs-utils/utils/mount/nfsumount.c nfs-utils-ag/utils/mount/nfsumount.c
@@ -30,7 +30,7 @@
 #include "conn.h"
 
 #include "mount_constants.h"
-#include "nfsmount.h"
+#include "mount.h"
 #include "nfsumount.h"
 
 #if !defined(MNT_FORCE)
utils/mount/nfsumount.h +1 -1
diff -uprN -X dontdiff nfs-utils/utils/mount/nfsumount.h nfs-utils-ag/utils/mount/nfsumount.h
@@ -2,7 +2,7 @@
 #define _NFS_UMOUNT_H
 
 #include "conn.h"
-#include "nfsmount.h"
+#include "mount.h"
 
 int nfsumount(int, char **);
 int nfs_call_umount(clnt_addr_t *, dirpath *);

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs

#1 lore raw
Quoted 3 lines · On Thursday June 22, [email protected] wrote:

Merge utils/mount/nfsmount.x and support/export/mount.x into support/export/mount.x.

Thanks for this and the other one!

NeilBrown

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs