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

* mkpasswd.c (main): Output passwd file in binary mode so that there are no CRs

Browse Source 
in the file.
* umount.cc (remove_all_user_mounts): Don't try to remove /cygdrive mounts.
This commit is contained in:
Christopher Faylor 2001-06-15 04:50:57 +00:00
parent e8d6e78f34
commit 12a9c87480
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/utils/ChangeLog
View File

@ -1,3 +1,10 @@
Fri Jun 15 00:49:21 2001 Christopher Faylor <cgf@cygnus.com>
* mkpasswd.c (main): Output passwd file in binary mode so that there
are no CRs in the file.
* umount.cc (remove_all_user_mounts): Don't try to remove /cygdrive
mounts.
Tue May 1 10:50:48 2001 Christopher Faylor <cgf@cygnus.com>
* mkpasswd.c (enum_users): Use /bin/bash as the default shell.

2
winsup/utils/mkpasswd.c
View File

@ -17,6 +17,7 @@
#include <getopt.h>
#include <lmaccess.h>
#include <lmapibuf.h>
#include <sys/fcntl.h>
SID_IDENTIFIER_AUTHORITY sid_world_auth = {SECURITY_WORLD_SID_AUTHORITY};
SID_IDENTIFIER_AUTHORITY sid_nt_auth = {SECURITY_NT_AUTHORITY};
@ -369,6 +370,7 @@ main (int argc, char **argv)
SID_NAME_USE use;
passed_home_path[0] = '\0';
setmode (1, O_BINARY);
if (GetVersion () < 0x80000000)
if (argc == 1)

6
winsup/utils/umount.cc
View File

@ -159,7 +159,8 @@ remove_all_user_mounts ()
while ((p = getmntent (m)) != NULL)
{
/* Remove the mount if it's a user mount. */
if (strncmp (p->mnt_type, "user", 4) == 0)
if (strncmp (p->mnt_type, "user", 4) == 0 &&
strstr (p->mnt_opts, "noumount") == NULL)
{
if (cygwin_umount (p->mnt_dir, 0))
error (p->mnt_dir);
@ -183,7 +184,8 @@ remove_all_system_mounts ()
while ((p = getmntent (m)) != NULL)
{
/* Remove the mount if it's a system mount. */
if (strncmp (p->mnt_type, "system", 6) == 0)
if (strncmp (p->mnt_type, "system", 6) == 0 &&
strstr (p->mnt_opts, "noumount") == NULL)
{
if (cygwin_umount (p->mnt_dir, MOUNT_SYSTEM))
error (p->mnt_dir);