JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* shared_info.h (mount_info): Remove mnt_ elements.

Browse Source 
* thread.h (struct _winsup_t): Add mnt_ elements.
* path.cc (fillout_mntent): Use mnt_ elements from reent_winsup ().
This commit is contained in:
Christopher Faylor
2001-04-02 04:27:12 +00:00
parent 68b3c65aa1
commit f97adf983d
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,9 @@
Mon Apr 2 00:24:08 2001 Christopher Faylor <cgf@cygnus.com>
* shared_info.h (mount_info): Remove mnt_ elements.
* thread.h (struct _winsup_t): Add mnt_ elements.
* path.cc (fillout_mntent): Use mnt_ elements from reent_winsup ().
Sun Apr 1 20:10:34 2001 Christopher Faylor <cgf@cygnus.com> Sun Apr 1 20:10:34 2001 Christopher Faylor <cgf@cygnus.com>
* exceptions.cc (sigframe::call_signal_handler): Return value of * exceptions.cc (sigframe::call_signal_handler): Return value of

29
winsup/cygwin/path.cc
View File

@@ -2049,37 +2049,36 @@ fillout_mntent (const char *native_path, const char *posix_path, unsigned flags)
table because the mount table might change, causing weird effects table because the mount table might change, causing weird effects
from the getmntent user's point of view. */ from the getmntent user's point of view. */
strcpy (mount_table->mnt_fsname, native_path); strcpy (_reent_winsup ()->mnt_fsname, native_path);
ret.mnt_fsname = mount_table->mnt_fsname; ret.mnt_fsname = _reent_winsup ()->mnt_fsname;
strcpy (mount_table->mnt_dir, posix_path); strcpy (_reent_winsup ()->mnt_dir, posix_path);
ret.mnt_dir = mount_table->mnt_dir; ret.mnt_dir = _reent_winsup ()->mnt_dir;
if (!(flags & MOUNT_SYSTEM)) /* user mount */ if (!(flags & MOUNT_SYSTEM)) /* user mount */
strcpy (mount_table->mnt_type, (char *) "user"); strcpy (_reent_winsup ()->mnt_type, (char *) "user");
else /* system mount */ else /* system mount */
strcpy (mount_table->mnt_type, (char *) "system"); strcpy (_reent_winsup ()->mnt_type, (char *) "system");
if ((flags & MOUNT_AUTO)) /* cygdrive */ ret.mnt_type = _reent_winsup ()->mnt_type;
strcat (mount_table->mnt_type, (char *) ",noumount");
ret.mnt_type = mount_table->mnt_type;
/* mnt_opts is a string that details mount params such as /* mnt_opts is a string that details mount params such as
binary or textmode, or exec. We don't print binary or textmode, or exec. We don't print
`silent' here; it's a magic internal thing. */ `silent' here; it's a magic internal thing. */
if (!(flags & MOUNT_BINARY)) if (!(flags & MOUNT_BINARY))
strcpy (mount_table->mnt_opts, (char *) "textmode"); strcpy (_reent_winsup ()->mnt_opts, (char *) "textmode");
else else
strcpy (mount_table->mnt_opts, (char *) "binmode"); strcpy (_reent_winsup ()->mnt_opts, (char *) "binmode");
if (flags & MOUNT_CYGWIN_EXEC) if (flags & MOUNT_CYGWIN_EXEC)
strcat (mount_table->mnt_opts, (char *) ",cygexec"); strcat (_reent_winsup ()->mnt_opts, (char *) ",cygexec");
else if (flags & MOUNT_EXEC) else if (flags & MOUNT_EXEC)
strcat (mount_table->mnt_opts, (char *) ",exec"); strcat (_reent_winsup ()->mnt_opts, (char *) ",exec");
if ((flags & MOUNT_AUTO)) /* cygdrive */
strcat (_reent_winsup ()->mnt_opts, (char *) ",noumount");
ret.mnt_opts = mount_table->mnt_opts; ret.mnt_opts = _reent_winsup ()->mnt_opts;
ret.mnt_freq = 1; ret.mnt_freq = 1;
ret.mnt_passno = 1; ret.mnt_passno = 1;

8
winsup/cygwin/shared_info.h
View File

@@ -40,7 +40,7 @@ public:
scheme should be satisfactory for a long while yet. */ scheme should be satisfactory for a long while yet. */
#define MAX_MOUNTS 30 #define MAX_MOUNTS 30
#define MOUNT_VERSION 0x01010102 #define MOUNT_VERSION 0x01010103
class reg_key; class reg_key;
class mount_info class mount_info
@@ -51,12 +51,6 @@ public:
int nmounts; int nmounts;
mount_item mount[MAX_MOUNTS]; mount_item mount[MAX_MOUNTS];
/* Strings used by getmntent(). */
char mnt_type[20];
char mnt_opts[20];
char mnt_fsname[MAX_PATH];
char mnt_dir[MAX_PATH];
/* cygdrive_prefix is used as the root of the path automatically /* cygdrive_prefix is used as the root of the path automatically
prepended to a path when the path has no associated mount. prepended to a path when the path has no associated mount.
cygdrive_flags are the default flags for the cygdrives. */ cygdrive_flags are the default flags for the cygdrives. */

4
winsup/cygwin/thread.h
View File

@@ -88,6 +88,10 @@ struct _winsup_t
struct mntent mntbuf; struct mntent mntbuf;
int _iteration; int _iteration;
DWORD available_drives; DWORD available_drives;
char mnt_type[80];
char mnt_opts[80];
char mnt_fsname[MAX_PATH];
char mnt_dir[MAX_PATH];
/* strerror */ /* strerror */
char _strerror_buf[20]; char _strerror_buf[20];