summaryrefslogtreecommitdiff
path: root/editors/manedit/files
diff options
context:
space:
mode:
Diffstat (limited to 'editors/manedit/files')
-rw-r--r--editors/manedit/files/mntent.h35
-rw-r--r--editors/manedit/files/mntent_compat.c90
-rw-r--r--editors/manedit/files/patch-Makefile.FreeBSD24
-rw-r--r--editors/manedit/files/patch-fb.c20
4 files changed, 0 insertions, 169 deletions
diff --git a/editors/manedit/files/mntent.h b/editors/manedit/files/mntent.h
deleted file mode 100644
index 1e37778b2178..000000000000
--- a/editors/manedit/files/mntent.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifdef HAVE_MNTENT_H
-#include <mntent.h>
-#else
-
-#ifndef mntent_h_
-#define mntent_h_
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/ucred.h>
-#include <sys/mount.h>
-
-#define MOUNTED "mounted"
-#define MNTTYPE_NFS "nfs"
-
-//#define MOPTSLEN (256 - (MNAMELEN * 2 + MFSNAMELEN + 2 * sizeof(int)))
-
-struct mntent {
- char *mnt_fsname; /* file system name */
- char *mnt_dir; /* file system path prefix */
- char *mnt_type; /* dbg, efs, nfs */
- char *mnt_opts; /* ro, hide, etc. */
- int mnt_freq; /* dump frequency, in days */
- int mnt_passno; /* pass number on parallel fsck */
-};
-
-FILE * setmntent(char * filep, char * type);
-struct mntent *getmntent(FILE * filep);
-//char * hasmntopt(struct mntent * mnt, char * opt);
-int endmntent(FILE * filep);
-
-#endif /* mntent_h_ */
-#endif /* not HAVE_MNTENT_H */
diff --git a/editors/manedit/files/mntent_compat.c b/editors/manedit/files/mntent_compat.c
deleted file mode 100644
index da8a68b79af6..000000000000
--- a/editors/manedit/files/mntent_compat.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "mntent.h"
-#include <sys/param.h>
-//#include <sys/ucred.h>
-#include <sys/mount.h>
-#include <fstab.h>
-
-struct statfs *getmntent_mntbufp;
-int getmntent_mntcount = 0;
-int getmntent_mntpos = 0;
-char mntent_global_opts[256];
-struct mntent mntent_global_mntent;
-
-FILE * setmntent(char * filep, char * type)
-{
- getmntent_mntpos = 0;
- getmntent_mntcount = getmntinfo(&getmntent_mntbufp, MNT_WAIT);
- return (FILE *)1; // dummy
-}
-
-void getmntent_addopt(char ** c, const char * s)
-{
- int i = strlen(s);
- *(*c)++ = ',';
- strcpy(*c, s);
- *c += i;
-}
-
-struct mntent *getmntent(FILE * filep)
-{
- char *c = mntent_global_opts+2;
- struct fstab *fst;
- if (getmntent_mntpos >= getmntent_mntcount)
- return 0;
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_RDONLY) strcpy(mntent_global_opts, "ro");
- else strcpy(mntent_global_opts, "rw");
-
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_SYNCHRONOUS) getmntent_addopt(&c, "sync");
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOEXEC) getmntent_addopt(&c, "noexec");
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOSUID) getmntent_addopt(&c, "nosuid");
-#ifdef MNT_NODEV
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NODEV) getmntent_addopt(&c, "nodev");
-#endif
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_UNION) getmntent_addopt(&c, "union");
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_ASYNC) getmntent_addopt(&c, "async");
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOATIME) getmntent_addopt(&c, "noatime");
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOCLUSTERR) getmntent_addopt(&c, "noclusterr");
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOCLUSTERW) getmntent_addopt(&c, "noclusterw");
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOSYMFOLLOW) getmntent_addopt(&c, "nosymfollow");
- if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_SUIDDIR) getmntent_addopt(&c, "suiddir");
-
- mntent_global_mntent.mnt_fsname = getmntent_mntbufp[getmntent_mntpos].f_mntfromname;
- mntent_global_mntent.mnt_dir = getmntent_mntbufp[getmntent_mntpos].f_mntonname;
- mntent_global_mntent.mnt_type = getmntent_mntbufp[getmntent_mntpos].f_fstypename;
- mntent_global_mntent.mnt_opts = mntent_global_opts;
- if ((fst = getfsspec(getmntent_mntbufp[getmntent_mntpos].f_mntfromname)))
- {
- mntent_global_mntent.mnt_freq = fst->fs_freq;
- mntent_global_mntent.mnt_passno = fst->fs_passno;
- }
- else if ((fst = getfsfile(getmntent_mntbufp[getmntent_mntpos].f_mntonname)))
- {
- mntent_global_mntent.mnt_freq = fst->fs_freq;
- mntent_global_mntent.mnt_passno = fst->fs_passno;
- }
- else if (strcmp(getmntent_mntbufp[getmntent_mntpos].f_fstypename, "ufs") == 0)
- {
- if (strcmp(getmntent_mntbufp[getmntent_mntpos].f_mntonname, "/") == 0)
- {
- mntent_global_mntent.mnt_freq = 1;
- mntent_global_mntent.mnt_passno = 1;
- }
- else
- {
- mntent_global_mntent.mnt_freq = 2;
- mntent_global_mntent.mnt_passno = 2;
- }
- }
- else
- {
- mntent_global_mntent.mnt_freq = 0;
- mntent_global_mntent.mnt_passno = 0;
- }
- ++getmntent_mntpos;
- return & mntent_global_mntent;
-}
-
-int endmntent(FILE * filep)
-{
- return 0;
-}
diff --git a/editors/manedit/files/patch-Makefile.FreeBSD b/editors/manedit/files/patch-Makefile.FreeBSD
deleted file mode 100644
index d020abedf3a3..000000000000
--- a/editors/manedit/files/patch-Makefile.FreeBSD
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.FreeBSD.orig 2008-10-11 23:00:00 UTC
-+++ Makefile.FreeBSD
-@@ -56,9 +56,10 @@ CFLAGS += $(GTK_CFLAGS) -O2 -Wall \
- -DPREFIX=\"$(PREFIX)\" \
- -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
-
--CPPFLAGS = -D__cplusplus -Dc_plusplus
-+CPPFLAGS = $(CXXFLAGS) $(GTK_CFLAGS) -O2 -Wall \
-+ -DPREFIX=\"$(PREFIX)\" \
-+ -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
-
--
- # ########################################################################
- # Dependant Libraries:
- #
-@@ -109,7 +110,7 @@ OBJ_CPP = $(SRC_CPP:.cpp=.o)
- .c.o:
- $(CC) -c $*.c $(INC) $(CFLAGS)
- .cpp.o:
-- $(CPP) -c $*.cpp $(INC) $(CFLAGS) $(CPPFLAGS)
-+ $(CPP) -c $*.cpp $(INC) $(CPPFLAGS)
-
-
- # ########################################################################
diff --git a/editors/manedit/files/patch-fb.c b/editors/manedit/files/patch-fb.c
deleted file mode 100644
index faa2c01ee076..000000000000
--- a/editors/manedit/files/patch-fb.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- fb.c.orig 2013-02-24 14:29:59.000000000 +0100
-+++ fb.c 2013-02-24 14:30:35.000000000 +0100
-@@ -16,7 +16,7 @@
- # include <sys/mnttab.h>
- # include <sys/vfstab.h>
- # elif defined(__FreeBSD__)
--/* # include <mntent.h> */
-+# include "mntent.h"
- # else
- # include <mntent.h>
- # endif
-@@ -1254,8 +1254,6 @@ static GList *FileBrowserGetDrivePaths(v
- }
-
- return(paths_list);
--#elif defined(__FreeBSD__)
-- return(NULL);
- #else /* UNIX */
- GList *paths_list = NULL;
- #ifdef __SOLARIS__
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 00:26:51 +0000