aboutsummaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2002-11-30 22:52:07 +0000
committerKris Kennaway <kris@FreeBSD.org>2002-11-30 22:52:07 +0000
commit8301ced0684476a28229b7c0e53b6868f6a40853 (patch)
treebf6197781263155cf03c2f489094b77c0d2f3e29 /shells
parent8fa14934e711cf4c25ffb1cc21ee21fe58ef0b02 (diff)
downloadports-8301ced0684476a28229b7c0e53b6868f6a40853.tar.gz
ports-8301ced0684476a28229b7c0e53b6868f6a40853.zip
Notes
Diffstat (limited to 'shells')
-rw-r--r--shells/sash/files/patch-al17
1 files changed, 10 insertions, 7 deletions
diff --git a/shells/sash/files/patch-al b/shells/sash/files/patch-al
index 6b0020a54239..457e24725bb2 100644
--- a/shells/sash/files/patch-al
+++ b/shells/sash/files/patch-al
@@ -1,6 +1,5 @@
-diff -NPru cmds.c.orig cmds.c
---- cmds.c.orig Thu Jun 3 23:42:39 1999
-+++ cmds.c Sun Jan 23 00:35:15 2000
+--- cmds.c.orig Thu Jun 3 14:42:39 1999
++++ cmds.c Sat Nov 30 14:55:20 2002
@@ -6,17 +6,22 @@
* Most simple built-in commands are here.
*/
@@ -26,15 +25,19 @@ diff -NPru cmds.c.orig cmds.c
void
-@@ -501,19 +506,34 @@
+@@ -501,19 +506,38 @@
}
}
+#ifdef __FreeBSD__
+#include <ufs/ufs/ufsmount.h>
+#include <isofs/cd9660/cd9660_mount.h>
++#if __FreeBSD_version >= 500019
++#include <fs/msdosfs/msdosfsmount.h>
++#else
+#include <msdosfs/msdosfsmount.h>
+#endif
++#endif
void
do_mount(int argc, const char ** argv)
@@ -66,7 +69,7 @@ diff -NPru cmds.c.orig cmds.c
while ((argc > 0) && (**argv == '-'))
{
argc--;
-@@ -533,6 +553,7 @@
+@@ -533,6 +557,7 @@
argc--;
break;
@@ -74,7 +77,7 @@ diff -NPru cmds.c.orig cmds.c
case 'r':
flags |= MS_RDONLY;
break;
-@@ -540,6 +561,16 @@
+@@ -540,6 +565,16 @@
case 'm':
flags |= MS_REMOUNT;
break;
@@ -91,7 +94,7 @@ diff -NPru cmds.c.orig cmds.c
default:
fprintf(stderr, "Unknown option\n");
-@@ -555,15 +586,44 @@
+@@ -555,15 +590,44 @@
return;
}