- Update to version 3.8

PR:		187491
Submitted by:	ports fury

1 files changed, 44 insertions, 20 deletions

diff --git a/shells/sash/files/patch-cmds.c b/shells/sash/files/patch-cmds.c
index dd4d50092d8f..2ca9130950b5 100644
--- a/shells/sash/files/patch-cmds.c
+++ b/shells/sash/files/patch-cmds.c
@@ -1,25 +1,34 @@
 --- cmds.c.orig	Mon Jul 22 00:28:19 2002
 +++ cmds.c	Fri Sep  3 16:35:01 2004
-@@ -17,6 +17,18 @@
+@@ -17,9 +17,18 @@
  #include <utime.h>
  #include <errno.h>
  
 +#if __FreeBSD__
 +#include <ufs/ufs/ufsmount.h>
 +#include <isofs/cd9660/cd9660_mount.h>
-+#if __FreeBSD_version >= 500019
 +#include <fs/msdosfs/msdosfsmount.h>
++#if __FreeBSD_version < 1000000
 +#include <fs/ntfs/ntfsmount.h>
-+#else
-+#include <msdosfs/msdosfsmount.h>
-+#include <ntfs/ntfsmount.h>
++#define HAVE_BSD_NTFSMOUNT
 +#endif
 +#endif
 +
  #if	HAVE_LINUX_MOUNT
  #include <linux/fs.h>
- #endif
-@@ -564,6 +576,10 @@
+-#endif
+ 
+ /* Need to tell loop.h what the actual dev_t type is. */
+ #undef dev_t
+@@ -32,6 +41,7 @@
+ #undef dev_t
+ #define dev_t dev_t
+ 
++#endif
+ 
+ int
+ do_echo(int argc, const char ** argv)
+@@ -716,6 +726,10 @@
  				flags |= MNT_RDONLY;
  				break;
  
@@ -30,7 +39,7 @@
  			case 's':
  				flags |= MNT_NOSUID;
  				break;
-@@ -594,35 +610,47 @@
+@@ -748,46 +762,58 @@
  #elif	HAVE_BSD_MOUNT
  	{
  		struct	    ufs_args ufs;
@@ -38,30 +47,37 @@
  		struct	    iso_args iso;
 -		struct	    mfs_args mfs;
  		struct	    msdosfs_args msdosfs;
++#ifdef	HAVE_BSD_NTFSMOUNT
 +		struct	    ntfs_args ntfs;
++#endif
  		void *	    args;
  
- 		if(!strcmp(type, "ffs") || !strcmp(type, "ufs")) {
+ 		if (!strcmp(type, "ffs") || !strcmp(type, "ufs"))
+ 		{
 +			memset(&ufs, 0, sizeof(ufs));
  			ufs.fspec = (char*) argv[0];
  			args = &ufs;
--		} else if(!strcmp(type, "adosfs")) {
+ 		}
+-		else if (!strcmp(type, "adosfs"))
+-		{
 -			adosfs.fspec = (char*) argv[0];
 -			adosfs.uid = 0;
 -			adosfs.gid = 0;
 -			args = &adosfs;
- 		} else if(!strcmp(type, "cd9660")) {
+-		}
+ 		else if (!strcmp(type, "cd9660"))
+ 		{
 +			memset(&iso, 0, sizeof(iso));
  			iso.fspec = (char*) argv[0];
  			args = &iso;
--		} else if(!strcmp(type, "mfs")) {
+ 		}
+-		else if (!strcmp(type, "mfs"))
+-		{
 -			mfs.fspec = (char*) argv[0];
 -			args = &mfs;
-+		} else if(!strcmp(type, "ext2fs")) {
-+			memset(&ufs, 0, sizeof(ufs));
-+			ufs.fspec = (char*) argv[0];
-+			args = &ufs;
- 		} else if(!strcmp(type, "msdos")) {
+-		}
+ 		else if (!strcmp(type, "msdos"))
+ 		{
 +			memset(&msdosfs, 0, sizeof(msdosfs));
  			msdosfs.fspec = (char*) argv[0];
 -			msdosfs.uid = 0;
@@ -73,6 +89,7 @@
 +				msdosfs.mask = msdosfs.dirmask = 7555;
 +			}
  			args = &msdosfs;
++#ifdef	HAVE_BSD_NTFSMOUNT
 +		} else if(!strcmp(type, "ntfs")) {
 +			memset(&ntfs, 0, sizeof(ntfs));
 +			ntfs.fspec = (char*) argv[0];
@@ -83,11 +100,18 @@
 +				ntfs.mode = 0755;
 +			}
 +			args = &ntfs;
- 		} else {
++#endif
+ 		}
+ 		else
+ 		{
  			fprintf(stderr, "Unknown filesystem type: %s", type);
  			fprintf(stderr,
 -			    "Supported: ffs ufs adosfs cd9660 mfs msdos\n");
++#ifdef	HAVE_BSD_NTFSMOUNT
 +			    "Supported: ffs ufs cd9660 ext2fs msdos ntfs\n");
- 			return;
- 		}
++#else
++			    "Supported: ffs ufs cd9660 ext2fs msdos\n");
++#endif
  
+ 			return 1;
+ 		}