From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 19 Jul 2014 09:40:02 +0000 (+0200)
Subject: Properly wrap inclusion of linux/loop.h and drop adosfs, mfs support
X-Git-Tag: debian/3.8-3~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bea606b040098e318dac2ddf808afea055733f1b;p=sash

Properly wrap inclusion of linux/loop.h and drop adosfs, mfs support
---

diff --git a/debian/patches/freebsd_build b/debian/patches/freebsd_build
index babb8e0..037d67c 100644
--- a/debian/patches/freebsd_build
+++ b/debian/patches/freebsd_build
@@ -35,7 +35,7 @@ Index: git/cmds.c
 ===================================================================
 --- git.orig/cmds.c
 +++ git/cmds.c
-@@ -19,6 +19,10 @@
+@@ -19,8 +19,13 @@
  
  #if	HAVE_LINUX_MOUNT
  #include <linux/fs.h>
@@ -45,7 +45,53 @@ Index: git/cmds.c
 +#include <fs/msdosfs/msdosfsmount.h>
  #endif
  
++#if    HAVE_LINUX_LOSETUP
  /* Need to tell loop.h what the actual dev_t type is. */
+ #undef dev_t
+ #if defined(__alpha) || (defined(__sparc__) && defined(__arch64__))
+@@ -31,7 +36,7 @@
+ #include <linux/loop.h>
+ #undef dev_t
+ #define dev_t dev_t
+-
++#endif
+ 
+ int
+ do_echo(int argc, const char ** argv)
+@@ -753,9 +758,7 @@ do_mount(int argc, const char ** argv)
+ #elif	HAVE_BSD_MOUNT
+ 	{
+ 		struct	    ufs_args ufs;
+-		struct	    adosfs_args adosfs;
+ 		struct	    iso_args iso;
+-		struct	    mfs_args mfs;
+ 		struct	    msdosfs_args msdosfs;
+ 		void *	    args;
+ 
+@@ -764,23 +767,11 @@ do_mount(int argc, const char ** argv)
+ 			ufs.fspec = (char*) argv[0];
+ 			args = &ufs;
+ 		}
+-		else if (!strcmp(type, "adosfs"))
+-		{
+-			adosfs.fspec = (char*) argv[0];
+-			adosfs.uid = 0;
+-			adosfs.gid = 0;
+-			args = &adosfs;
+-		}
+ 		else if (!strcmp(type, "cd9660"))
+ 		{
+ 			iso.fspec = (char*) argv[0];
+ 			args = &iso;
+ 		}
+-		else if (!strcmp(type, "mfs"))
+-		{
+-			mfs.fspec = (char*) argv[0];
+-			args = &mfs;
+-		}
+ 		else if (!strcmp(type, "msdos"))
+ 		{
+ 			msdosfs.fspec = (char*) argv[0];
 Index: git/sash.c
 ===================================================================
 --- git.orig/sash.c