Prefix libc (u)mount with minix_

The goal is to prevent a name collision with the expected mount/umount
function signatures, if we decide one day to allow any application
using those to work on MINIX.

At this moment the caller has to start the required services, but if we
implement that logic inside the mount/unmout function, this would allow
any application to call those function successfully.

By renaming those now, we prevent a possible ABI break in the future.

Change-Id: Iaf6a9472bca0dda6bfe634bdb6029b3aa2e1ea3b

diff --git a/commands/mount/mount.c b/commands/mount/mount.c
index fa34bcccd581d6942bf05914ff9f25e0f0472460..e3e968b8429472555e6001c44c5b7b2e64b8589a 100644 (file)
--- a/commands/mount/mount.c
+++ b/commands/mount/mount.c
@@ -76,7 +76,7 @@ char *argv[];
        }
   }
   
-  if (mount(device, argv[2], mountflags, srvflags, type, args) < 0) {
+  if (minix_mount(device, argv[2], mountflags, srvflags, type, args) < 0) {
        err = strerror(errno);
        fprintf(stderr, "mount: Can't mount %s on %s: %s\n",
                argv[1], argv[2], err);
@@ -153,7 +153,7 @@ mount_all()
                if (!strcmp(device, "none")) 
                        device = NULL;
 
-               if (mount(device, mountpoint, mountflags, 0, fs->fs_vfstype,
+               if (minix_mount(device, mountpoint, mountflags, 0, fs->fs_vfstype,
                    fs->fs_mntops) != 0) {
                        err = strerror(errno);
                        fprintf(stderr, "mount: Can't mount %s on %s: %s\n",

diff --git a/commands/umount/umount.c b/commands/umount/umount.c
index b724a7a11c8b39a8375a61d9f3baadefef350221..411a9da5b52b201a2d78b9b9ef04b4ed25508bb2 100644 (file)
--- a/commands/umount/umount.c
+++ b/commands/umount/umount.c
@@ -47,7 +47,7 @@ char *argv[];
  
   found = find_mtab_entry(name);
 
-  if (umount(name, umount_flags) < 0) {
+  if (minix_umount(name, umount_flags) < 0) {
        if (errno == EINVAL)
                std_err("umount: Device not mounted\n");
        else if (errno == ENOTBLK)

diff --git a/lib/libc/sys-minix/mount.c b/lib/libc/sys-minix/mount.c
index 6ca0543a81e448ad1f37f6065f7082c0f7a3e736..3f942b74482e22a50259e830f863359508229ca0 100644 (file)
--- a/lib/libc/sys-minix/mount.c
+++ b/lib/libc/sys-minix/mount.c
@@ -28,7 +28,7 @@ static int rs_down(char *label)
 
 char *find_rslabel(char *args_line);
 
-int mount(char *special, char *name, int mountflags, int srvflags,
+int minix_mount(char *special, char *name, int mountflags, int srvflags,
          char *type, char *args)
 {
   int r;
@@ -165,7 +165,7 @@ int mount(char *special, char *name, int mountflags, int srvflags,
   return r;
 }
 
-int umount(const char *name, int srvflags)
+int minix_umount(const char *name, int srvflags)
 {
   char label[MNT_LABEL_LEN];
   message m;

diff --git a/man/man2/mount.2 b/man/man2/mount.2
index 78d762feaff9812c73b5f8cb9877829444d7447d..afad7c9722c6a6eed07cc7d9be1ff7ae0f763322 100644 (file)
--- a/man/man2/mount.2
+++ b/man/man2/mount.2
@@ -6,8 +6,8 @@ mount, umount \- mount or umount a file system
 .nf
 #include <sys/mount.h>
 
-int mount(char *\fIspecial\fP, char *\fIname\fP, int \fImountflags\fP, int \fIsrvflags\fP, char *\fItype\fP, char *\fIargs\fP)
-int umount(char *\fIname\fP, int \fIsrvflags)
+int minix_mount(char *\fIspecial\fP, char *\fIname\fP, int \fImountflags\fP, int \fIsrvflags\fP, char *\fItype\fP, char *\fIargs\fP)
+int minix_umount(char *\fIname\fP, int \fIsrvflags)
 .fi
 .ft P
 .SH DESCRIPTION

diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 7cfdb8648238f57cbfb6337b591476dd147be782..b197461e0e5e73c5864412fdec31c0f2dd141964 100644 (file)
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -480,7 +480,7 @@ int getfh(const char *, void *, size_t *)
 #if !defined(__minix)
 int    unmount(const char *, int);
 #else
-int    umount(const char *_name, int srvflags);
+int    minix_umount(const char *_name, int srvflags);
 #endif /* !defined(__minix) */
 
 #if defined(_NETBSD_SOURCE)
@@ -488,7 +488,7 @@ int umount(const char *_name, int srvflags);
 #if !defined(__minix)
 int mount(const char *, const char *, int, void *, size_t) __RENAME(__mount50);
 #else
-int mount(char *_spec, char *_name, int _mountflags, int srvflags, char *type,
+int minix_mount(char *_spec, char *_name, int _mountflags, int srvflags, char *type,
        char *args);
 #endif /* !defined(__minix) */
 int    fhopen(const void *, size_t, int) __RENAME(__fhopen40);