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

Cleanup formatting on some files. Remove excessive whitespace.

Browse Source
This commit is contained in:
Christopher Faylor 2000-10-28 05:00:00 +00:00
parent 3c952fed3f
commit eedc36cb12
15 changed files with 753 additions and 675 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/utils/Makefile.in
View File

@ -65,7 +65,7 @@ MINGW_DEP_LDLIBS:=${ALL_DEP_LDLIBS} ${MINGW_LIB}
ALL_LDFLAGS:=-B$(newlib_build)/libc/ -B$(newlib_build)/libm/ -B$(w32api_lib)/ \ ALL_LDFLAGS:=-B$(newlib_build)/libc/ -B$(newlib_build)/libm/ -B$(w32api_lib)/ \
$(LDFLAGS) $(ALL_LDLIBS) $(LDFLAGS) $(ALL_LDLIBS)
MINGW_LDFLAGS:=$(ALL_LDFLAGS) $(MINGW_LIB) MINGW_LDFLAGS:=$(ALL_LDFLAGS) $(MINGW_LIB)
DUMPER_LDFLAGS:=$(ALL_LDFLAGS) $(DUMPER_LIB) DUMPER_LDFLAGS:=$(ALL_LDFLAGS) $(DUMPER_LIB)
PROGS:=mount$(EXEEXT) umount$(EXEEXT) ps$(EXEEXT) kill$(EXEEXT) \ PROGS:=mount$(EXEEXT) umount$(EXEEXT) ps$(EXEEXT) kill$(EXEEXT) \
mkpasswd$(EXEEXT) mkgroup$(EXEEXT) cygpath$(EXEEXT) cygcheck$(EXEEXT) \ mkpasswd$(EXEEXT) mkgroup$(EXEEXT) cygpath$(EXEEXT) cygcheck$(EXEEXT) \

4
winsup/utils/configure.in
View File

@ -1,8 +1,8 @@
dnl Autoconf configure script for Cygwin utilities. dnl Autoconf configure script for Cygwin utilities.
dnl Copyright 1996, 1997 Cygnus Solutions. dnl Copyright 1996, 1997, 1998, 1999, 2000 Cygnus Solutions.
dnl dnl
dnl This file is part of Cygwin. dnl This file is part of Cygwin.
dnl dnl
dnl This software is a copyrighted work licensed under the terms of the dnl This software is a copyrighted work licensed under the terms of the
dnl Cygwin license. Please consult the file "CYGWIN_LICENSE" for dnl Cygwin license. Please consult the file "CYGWIN_LICENSE" for
dnl details. dnl details.

283
winsup/utils/cygcheck.cc
View File

@ -29,8 +29,7 @@ typedef long long longlong;
typedef __int64 longlong; typedef __int64 longlong;
#endif #endif
const char *known_env_vars[] = const char *known_env_vars[] = {
{
"c_include_path", "c_include_path",
"compiler_path", "compiler_path",
"cxx_include_path", "cxx_include_path",
@ -55,21 +54,45 @@ const char *known_env_vars[] =
0 0
}; };
struct { struct
{
const char *name; const char *name;
int missing_is_good; int missing_is_good;
} common_apps[] = { }
{ "bash", 0 }, common_apps[] =
{ "cat", 0 }, {
{ "cpp", 1 }, {
{ "find", 0 }, "bash", 0}
{ "gcc", 0 }, ,
{ "gdb", 0 }, {
{ "ld", 0 }, "cat", 0}
{ "ls", 0 }, ,
{ "make", 0 }, {
{ "sh", 0 }, "cpp", 1}
{ 0, 0 } ,
{
"find", 0}
,
{
"gcc", 0}
,
{
"gdb", 0}
,
{
"ld", 0}
,
{
"ls", 0}
,
{
"make", 0}
,
{
"sh", 0}
,
{
0, 0}
}; };
int num_paths = 0, max_paths = 0; int num_paths = 0, max_paths = 0;
@ -102,8 +125,8 @@ void
init_paths () init_paths ()
{ {
char tmp[4000], *sl; char tmp[4000], *sl;
add_path ((char *) ".", 1); /* to be replaced later */ add_path ((char *) ".", 1); /* to be replaced later */
add_path ((char *) ".", 1); /* the current directory */ add_path ((char *) ".", 1); /* the current directory */
GetSystemDirectory (tmp, 4000); GetSystemDirectory (tmp, 4000);
add_path (tmp, strlen (tmp)); add_path (tmp, strlen (tmp));
sl = strrchr (tmp, '\\'); sl = strrchr (tmp, '\\');
@ -148,7 +171,7 @@ find_on_path (char *file, char *default_extension,
return file; return file;
if (strchr (file, '.')) if (strchr (file, '.'))
default_extension = (char *)""; default_extension = (char *) "";
for (int i = 0; i < num_paths; i++) for (int i = 0; i < num_paths; i++)
{ {
@ -263,13 +286,13 @@ struct ExpDirectory
}; };
struct ImpDirectory struct ImpDirectory
{ {
unsigned characteristics; unsigned characteristics;
unsigned timestamp; unsigned timestamp;
unsigned forwarder_chain; unsigned forwarder_chain;
unsigned name_rva; unsigned name_rva;
unsigned iat_rva; unsigned iat_rva;
}; };
void track_down (char *file, char *suffix, int lvl); void track_down (char *file, char *suffix, int lvl);
@ -299,9 +322,9 @@ cygwin_info (HANDLE h)
major = minor = NULL; major = minor = NULL;
while (buf < bufend) while (buf < bufend)
if ((buf = (char *) memchr (buf, '%', bufend - buf)) == NULL) if ((buf = (char *) memchr (buf, '%', bufend - buf)) == NULL)
break; break;
else if (strncmp ("%%% Cygwin ", buf, CYGPREFIX) != 0) else if (strncmp ("%%% Cygwin ", buf, CYGPREFIX) != 0)
buf++; buf++;
else else
{ {
char *p = strchr (buf += CYGPREFIX, '\n'); char *p = strchr (buf += CYGPREFIX, '\n');
@ -339,8 +362,10 @@ dll_info (const char *path, HANDLE fh, int lvl, int recurse)
int nsections = get_word (fh, pe_header_offset + 4 + 2); int nsections = get_word (fh, pe_header_offset + 4 + 2);
char *sections = (char *) malloc (nsections * 40); char *sections = (char *) malloc (nsections * 40);
SetFilePointer (fh, pe_header_offset + 4 + 20 + get_word (fh, pe_header_offset + 4 + 16), SetFilePointer (fh,
0, FILE_BEGIN); pe_header_offset + 4 + 20 + get_word (fh,
pe_header_offset + 4 +
16), 0, FILE_BEGIN);
ReadFile (fh, sections, nsections * 40, &junk, 0); ReadFile (fh, sections, nsections * 40, &junk, 0);
if (verbose && num_entries >= 1 && export_size > 0) if (verbose && num_entries >= 1 && export_size > 0)
@ -436,8 +461,9 @@ track_down (char *file, char *suffix, int lvl)
printf ("%s", path); printf ("%s", path);
HANDLE fh = CreateFile (path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, HANDLE fh =
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); CreateFile (path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (fh == INVALID_HANDLE_VALUE) if (fh == INVALID_HANDLE_VALUE)
{ {
printf (" - Cannot open\n"); printf (" - Cannot open\n");
@ -462,8 +488,7 @@ ls (char *f)
FileTimeToSystemTime (&info.ftLastWriteTime, &systime); FileTimeToSystemTime (&info.ftLastWriteTime, &systime);
printf ("%5dk %04d/%02d/%02d %s", printf ("%5dk %04d/%02d/%02d %s",
(((int) info.nFileSizeLow) + 512) / 1024, (((int) info.nFileSizeLow) + 512) / 1024,
systime.wYear, systime.wMonth, systime.wDay, systime.wYear, systime.wMonth, systime.wDay, f);
f);
dll_info (f, h, 16, 0); dll_info (f, h, 16, 0);
CloseHandle (h); CloseHandle (h);
@ -498,11 +523,11 @@ cygcheck (char *app)
extern char **environ; extern char **environ;
struct RegInfo struct RegInfo
{ {
RegInfo *prev; RegInfo *prev;
char *name; char *name;
HKEY key; HKEY key;
}; };
void void
show_reg (RegInfo * ri, int nest) show_reg (RegInfo * ri, int nest)
@ -538,8 +563,7 @@ scan_registry (RegInfo * prev, HKEY hKey, char *name, int cygnus)
#if 0 #if 0
char tmp[400]; char tmp[400];
FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError (), FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError (),
MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), tmp, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), tmp, 400, 0);
400, 0);
printf ("RegQueryInfoKey: %s\n", tmp); printf ("RegQueryInfoKey: %s\n", tmp);
#endif #endif
return; return;
@ -574,16 +598,6 @@ scan_registry (RegInfo * prev, HKEY hKey, char *name, int cygnus)
break; break;
} }
} }
#if 0
else
{
char tmp[400];
FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError (),
MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), tmp,
400, 0);
printf ("RegEnumValue: %s\n", tmp);
}
#endif
} }
free (value_name); free (value_name);
free (value_data); free (value_data);
@ -592,7 +606,8 @@ scan_registry (RegInfo * prev, HKEY hKey, char *name, int cygnus)
char *subkey_name = (char *) malloc (max_subkey_len + 1); char *subkey_name = (char *) malloc (max_subkey_len + 1);
for (i = 0; i < num_subkeys; i++) for (i = 0; i < num_subkeys; i++)
{ {
if (RegEnumKey (hKey, i, subkey_name, max_subkey_len + 1) == ERROR_SUCCESS) if (RegEnumKey (hKey, i, subkey_name, max_subkey_len + 1) ==
ERROR_SUCCESS)
{ {
HKEY sKey; HKEY sKey;
if (RegOpenKeyEx (hKey, subkey_name, 0, KEY_ALL_ACCESS, &sKey) if (RegOpenKeyEx (hKey, subkey_name, 0, KEY_ALL_ACCESS, &sKey)
@ -746,13 +761,14 @@ dump_sysinfo ()
printf ("Listing available drives...\n"); printf ("Listing available drives...\n");
printf ("Drv Type Size Free Flags Name\n"); printf ("Drv Type Size Free Flags Name\n");
} }
int prev_mode = SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); int prev_mode =
SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
int drivemask = GetLogicalDrives (); int drivemask = GetLogicalDrives ();
HINSTANCE k32 = LoadLibrary ("kernel32.dll"); HINSTANCE k32 = LoadLibrary ("kernel32.dll");
BOOL (WINAPI *gdfse) (LPCSTR, long long *, long long *, long long *) = BOOL (WINAPI * gdfse) (LPCSTR, long long *, long long *, long long *) =
(BOOL (WINAPI *) (LPCSTR, long long *, long long *, long long *)) (BOOL (WINAPI *) (LPCSTR, long long *, long long *, long long *))
GetProcAddress (k32, "GetDiskFreeSpaceExA"); GetProcAddress (k32, "GetDiskFreeSpaceExA");
for (i = 0; i < 26; i++) for (i = 0; i < 26; i++)
{ {
@ -790,8 +806,7 @@ dump_sysinfo ()
int percent_full = -1; int percent_full = -1;
long long free_me = 0ULL, free_bytes = 0ULL, total_bytes = 1ULL; long long free_me = 0ULL, free_bytes = 0ULL, total_bytes = 1ULL;
if (gdfse != NULL if (gdfse != NULL && gdfse (drive, &free_me, &total_bytes, &free_bytes))
&& gdfse (drive, & free_me, & total_bytes, & free_bytes))
{ {
capacity_mb = total_bytes / (1024L * 1024L); capacity_mb = total_bytes / (1024L * 1024L);
percent_full = 100 - (int) ((100.0 * free_me) / total_bytes); percent_full = 100 - (int) ((100.0 * free_me) / total_bytes);
@ -834,7 +849,8 @@ dump_sysinfo ()
{ {
printf ("fd=floppy, hd=hard drive, cd=CD-ROM, net=Network Share\n"); printf ("fd=floppy, hd=hard drive, cd=CD-ROM, net=Network Share\n");
printf ("CP=Case Preserving, CS=Case Sensitive, UN=Unicode\n"); printf ("CP=Case Preserving, CS=Case Sensitive, UN=Unicode\n");
printf ("PA=Persistent ACLS, FC=File Compression, VC=Volume Compression\n"); printf
("PA=Persistent ACLS, FC=File Compression, VC=Volume Compression\n");
} }
printf ("\n"); printf ("\n");
@ -842,10 +858,9 @@ dump_sysinfo ()
if (givehelp) if (givehelp)
{ {
printf ("Mount entries: these map POSIX directories to your NT drives.\n"); printf
printf ("%-*s %-*s %-*s %s\n", ("Mount entries: these map POSIX directories to your NT drives.\n");
ml_fsname, "-NT-", printf ("%-*s %-*s %-*s %s\n", ml_fsname, "-NT-", ml_dir, "-POSIX-",
ml_dir, "-POSIX-",
ml_type, "-Type-", "-Flags-"); ml_type, "-Type-", "-Flags-");
} }
@ -856,24 +871,23 @@ dump_sysinfo ()
{ {
printf ("%-*s %-*s %-*s %s\n", printf ("%-*s %-*s %-*s %s\n",
ml_fsname, mnt->mnt_fsname, ml_fsname, mnt->mnt_fsname,
ml_dir, mnt->mnt_dir, ml_dir, mnt->mnt_dir, ml_type, mnt->mnt_type, mnt->mnt_opts);
ml_type, mnt->mnt_type,
mnt->mnt_opts);
} }
printf ("\n"); printf ("\n");
add_path ((char *) "\\bin", 4); /* just in case */ add_path ((char *) "\\bin", 4); /* just in case */
if (givehelp) if (givehelp)
printf ("Looking to see where common programs can be found, if at all...\n"); printf
("Looking to see where common programs can be found, if at all...\n");
for (i = 0; common_apps[i].name; i++) for (i = 0; common_apps[i].name; i++)
if (!find_on_path ((char *) common_apps[i].name, (char *) ".exe", 1, 0)) if (!find_on_path ((char *) common_apps[i].name, (char *) ".exe", 1, 0))
{ {
if (common_apps[i].missing_is_good) if (common_apps[i].missing_is_good)
printf ("Not Found: %s (good!)\n", common_apps[i].name); printf ("Not Found: %s (good!)\n", common_apps[i].name);
else else
printf ("Not Found: %s\n", common_apps[i].name); printf ("Not Found: %s\n", common_apps[i].name);
} }
printf ("\n"); printf ("\n");
if (givehelp) if (givehelp)
@ -922,8 +936,8 @@ int
check_keys () check_keys ()
{ {
HANDLE h = CreateFileA ("CONIN$", GENERIC_READ | GENERIC_WRITE, HANDLE h = CreateFileA ("CONIN$", GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (h == INVALID_HANDLE_VALUE || h == NULL) if (h == INVALID_HANDLE_VALUE || h == NULL)
return keyeprint ("Opening CONIN$"); return keyeprint ("Opening CONIN$");
@ -936,7 +950,7 @@ check_keys ()
{ {
mode &= ~ENABLE_PROCESSED_INPUT; mode &= ~ENABLE_PROCESSED_INPUT;
if (!SetConsoleMode (h, mode)) if (!SetConsoleMode (h, mode))
keyeprint ("GetConsoleMode"); keyeprint ("GetConsoleMode");
} }
fputs ("\nThis key check works only in a console window,", stderr); fputs ("\nThis key check works only in a console window,", stderr);
@ -955,70 +969,74 @@ check_keys ()
{ {
prev_in = in; prev_in = in;
if (!ReadConsoleInput (h, &in, 1, &mode)) if (!ReadConsoleInput (h, &in, 1, &mode))
keyeprint ("ReadConsoleInput"); keyeprint ("ReadConsoleInput");
if (!memcmp (&in, &prev_in, sizeof in)) if (!memcmp (&in, &prev_in, sizeof in))
continue; continue;
switch (in.EventType) switch (in.EventType)
{ {
case KEY_EVENT: case KEY_EVENT:
printf ("%s %ux VK: 0x%02x VS: 0x%02x A: 0x%02x CTRL: ", printf ("%s %ux VK: 0x%02x VS: 0x%02x A: 0x%02x CTRL: ",
in.Event.KeyEvent.bKeyDown ? "Pressed " : "Released", in.Event.KeyEvent.bKeyDown ? "Pressed " : "Released",
in.Event.KeyEvent.wRepeatCount, in.Event.KeyEvent.wRepeatCount,
in.Event.KeyEvent.wVirtualKeyCode, in.Event.KeyEvent.wVirtualKeyCode,
in.Event.KeyEvent.wVirtualScanCode, in.Event.KeyEvent.wVirtualScanCode,
(unsigned char) in.Event.KeyEvent.uChar.AsciiChar); (unsigned char) in.Event.KeyEvent.uChar.AsciiChar);
fputs (in.Event.KeyEvent.dwControlKeyState & CAPSLOCK_ON ? fputs (in.Event.KeyEvent.dwControlKeyState & CAPSLOCK_ON ?
"CL " : "-- ", stdout); "CL " : "-- ", stdout);
fputs (in.Event.KeyEvent.dwControlKeyState & ENHANCED_KEY ? fputs (in.Event.KeyEvent.dwControlKeyState & ENHANCED_KEY ?
"EK " : "-- ", stdout); "EK " : "-- ", stdout);
fputs (in.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED ? fputs (in.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED ?
"LA " : "-- ", stdout); "LA " : "-- ", stdout);
fputs (in.Event.KeyEvent.dwControlKeyState & LEFT_CTRL_PRESSED ? fputs (in.Event.KeyEvent.dwControlKeyState & LEFT_CTRL_PRESSED ?
"LC " : "-- ", stdout); "LC " : "-- ", stdout);
fputs (in.Event.KeyEvent.dwControlKeyState & NUMLOCK_ON ? fputs (in.Event.KeyEvent.dwControlKeyState & NUMLOCK_ON ?
"NL " : "-- ", stdout); "NL " : "-- ", stdout);
fputs (in.Event.KeyEvent.dwControlKeyState & RIGHT_ALT_PRESSED ? fputs (in.Event.KeyEvent.dwControlKeyState & RIGHT_ALT_PRESSED ?
"RA " : "-- ", stdout); "RA " : "-- ", stdout);
fputs (in.Event.KeyEvent.dwControlKeyState & RIGHT_CTRL_PRESSED ? fputs (in.Event.KeyEvent.dwControlKeyState & RIGHT_CTRL_PRESSED ?
"RC " : "-- ", stdout); "RC " : "-- ", stdout);
fputs (in.Event.KeyEvent.dwControlKeyState & SCROLLLOCK_ON ? fputs (in.Event.KeyEvent.dwControlKeyState & SCROLLLOCK_ON ?
"SL " : "-- ", stdout); "SL " : "-- ", stdout);
fputs (in.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED ? fputs (in.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED ?
"SH " : "-- ", stdout); "SH " : "-- ", stdout);
fputc ('\n', stdout); fputc ('\n', stdout);
break; break;
} }
} }
while (in.EventType != KEY_EVENT || while (in.EventType != KEY_EVENT ||
in.Event.KeyEvent.bKeyDown != FALSE || in.Event.KeyEvent.bKeyDown != FALSE ||
in.Event.KeyEvent.uChar.AsciiChar != 'q'); in.Event.KeyEvent.uChar.AsciiChar != 'q');
CloseHandle (h); CloseHandle (h);
return 0; return 0;
} }
void void
usage () usage ()
{ {
fprintf (stderr, "Usage: cygcheck [OPTIONS] [program ...]\n"); fprintf (stderr, "Usage: cygcheck [OPTIONS] [program ...]\n");
fprintf (stderr, " -s, --sysinfo = system information (not with -k)\n"); fprintf (stderr, " -s, --sysinfo = system information (not with -k)\n");
fprintf (stderr, " -v, --verbose = verbose output (indented) (for -s or programs)\n"); fprintf (stderr,
" -v, --verbose = verbose output (indented) (for -s or programs)\n");
fprintf (stderr, " -r, --registry = registry search (requires -s)\n"); fprintf (stderr, " -r, --registry = registry search (requires -s)\n");
fprintf (stderr, " -k, --keycheck = perform a keyboard check session (not with -s)\n"); fprintf (stderr,
" -k, --keycheck = perform a keyboard check session (not with -s)\n");
fprintf (stderr, " -h, --help = give help about the info\n"); fprintf (stderr, " -h, --help = give help about the info\n");
fprintf (stderr, "You must at least give either -s or -k or a program name\n"); fprintf (stderr,
"You must at least give either -s or -k or a program name\n");
exit (1); exit (1);
} }
struct option longopts[] = { struct option longopts[] = {
{ "sysinfo", no_argument, NULL, 's' }, {"sysinfo", no_argument, NULL, 's'},
{ "registry", no_argument, NULL, 'r' }, {"registry", no_argument, NULL, 'r'},
{ "verbose", no_argument, NULL, 'v' }, {"verbose", no_argument, NULL, 'v'},
{ "keycheck", no_argument, NULL, 'k' }, {"keycheck", no_argument, NULL, 'k'},
{ "help", no_argument, NULL, 'h' }, {"help", no_argument, NULL, 'h'},
{ 0, no_argument, NULL, 0 } {0, no_argument, NULL, 0}
}; };
char *opts = "srvkh"; char *opts = "srvkh";
@ -1031,24 +1049,23 @@ main (int argc, char **argv)
switch (i) switch (i)
{ {
case 's': case 's':
sysinfo = 1; sysinfo = 1;
break; break;
case 'r': case 'r':
registry = 1; registry = 1;
break; break;
case 'v': case 'v':
verbose = 1; verbose = 1;
break; break;
case 'k': case 'k':
keycheck = 1; keycheck = 1;
break; break;
case 'h': case 'h':
givehelp = 1; givehelp = 1;
break; break;
default: default:
usage (); usage ();
/*NOTREACHED*/ /*NOTREACHED*/}
}
argc -= optind; argc -= optind;
argv += optind; argv += optind;
@ -1059,7 +1076,7 @@ main (int argc, char **argv)
usage (); usage ();
if (keycheck) if (keycheck)
return check_keys(); return check_keys ();
init_paths (); init_paths ();
@ -1067,12 +1084,14 @@ main (int argc, char **argv)
{ {
if (argc == 1) if (argc == 1)
{ {
printf ("Here is where the OS will find your program, and which dlls\n"); printf
("Here is where the OS will find your program, and which dlls\n");
printf ("will be used for it. Use -v to see DLL version info\n"); printf ("will be used for it. Use -v to see DLL version info\n");
} }
else else
{ {
printf ("Here is where the OS will find your programs, and which dlls\n"); printf
("Here is where the OS will find your programs, and which dlls\n");
printf ("will be used for them. Use -v to see DLL version info\n"); printf ("will be used for them. Use -v to see DLL version info\n");
} }

12
winsup/utils/cygpath.cc
View File

@ -52,13 +52,13 @@ Usage: %s [-p|--path] (-u|--unix)|(-w|--windows [-s|--short-name]) filename\n\
-a|--absolute output absolute path\n\ -a|--absolute output absolute path\n\
-c|--close handle close handle (for use in captured process)\n\ -c|--close handle close handle (for use in captured process)\n\
-f|--file file read file for path information\n\ -f|--file file read file for path information\n\
-u|--unix print Unix form of filename\n\ -u|--unix print Unix form of filename\n\
-w|--windows print Windows form of filename\n\ -w|--windows print Windows form of filename\n\
-s|--short-name print Windows short form of filename\n\ -s|--short-name print Windows short form of filename\n\
-W|--windir print `Windows' directory\n\ -W|--windir print `Windows' directory\n\
-S|--sysdir print `system' directory\n\ -S|--sysdir print `system' directory\n\
-p|--path filename argument is a path\n\ -p|--path filename argument is a path\n\
-i|--ignore ignore missing argument\n", -i|--ignore ignore missing argument\n",
prog_name); prog_name);
exit (ignore_flag ? 0 : status); exit (ignore_flag ? 0 : status);
} }

658
winsup/utils/dumper.cc
View File

File diff suppressed because it is too large Load Diff

106
winsup/utils/getfacl.c
View File

@ -8,7 +8,8 @@
#include <sys/acl.h> #include <sys/acl.h>
#include <sys/stat.h> #include <sys/stat.h>
char *permstr (mode_t perm) char *
permstr (mode_t perm)
{ {
static char pbuf[4]; static char pbuf[4];
@ -20,7 +21,8 @@ char *permstr (mode_t perm)
} }
#if 0 #if 0
char *username (uid_t uid) char *
username (uid_t uid)
{ {
static char ubuf[256]; static char ubuf[256];
struct passwd *pw; struct passwd *pw;
@ -31,7 +33,8 @@ char *username (uid_t uid)
strcpy (ubuf, "<unknown>"); strcpy (ubuf, "<unknown>");
} }
char *groupname (gid_t gid) char *
groupname (gid_t gid)
{ {
static char gbuf[256]; static char gbuf[256];
struct group *gr; struct group *gr;
@ -58,67 +61,66 @@ main (int argc, char **argv)
switch (c) switch (c)
{ {
case 'a': case 'a':
aopt = 1; aopt = 1;
break; break;
case 'd': case 'd':
dopt = 1; dopt = 1;
break; break;
default: default:
fprintf (stderr, "usage: %s [-ad] file...\n", argv[0]); fprintf (stderr, "usage: %s [-ad] file...\n", argv[0]);
return 1; return 1;
} }
while ((c = optind++) < argc) while ((c = optind++) < argc)
{ {
if (stat (argv[c], &st)) if (stat (argv[c], &st))
{ {
perror (argv[0]); perror (argv[0]);
continue; continue;
} }
if (! first) if (!first)
putchar ('\n'); putchar ('\n');
first = 0; first = 0;
printf ("# file: %s\n", argv[c]); printf ("# file: %s\n", argv[c]);
printf ("# owner: %d\n", st.st_uid); printf ("# owner: %d\n", st.st_uid);
printf ("# group: %d\n", st.st_gid); printf ("# group: %d\n", st.st_gid);
if ((c = acl (argv[c], GETACL, MAX_ACL_ENTRIES, acls)) < 0) if ((c = acl (argv[c], GETACL, MAX_ACL_ENTRIES, acls)) < 0)
{ {
perror (argv[0]); perror (argv[0]);
continue; continue;
} }
for (i = 0; i < c; ++i) for (i = 0; i < c; ++i)
{ {
if (acls[i].a_type & ACL_DEFAULT) if (acls[i].a_type & ACL_DEFAULT)
{ {
if (aopt) if (aopt)
continue; continue;
printf ("default:"); printf ("default:");
} }
else if (dopt) else if (dopt)
continue; continue;
switch (acls[i].a_type & ~ACL_DEFAULT) switch (acls[i].a_type & ~ACL_DEFAULT)
{ {
case USER_OBJ: case USER_OBJ:
printf ("user::"); printf ("user::");
break; break;
case USER: case USER:
printf ("user:%d:", acls[i].a_id); printf ("user:%d:", acls[i].a_id);
break; break;
case GROUP_OBJ: case GROUP_OBJ:
printf ("group::"); printf ("group::");
break; break;
case GROUP: case GROUP:
printf ("group:%d:", acls[i].a_id); printf ("group:%d:", acls[i].a_id);
break; break;
case CLASS_OBJ: case CLASS_OBJ:
printf ("mask::"); printf ("mask::");
break; break;
case OTHER_OBJ: case OTHER_OBJ:
printf ("other::"); printf ("other::");
break; break;
} }
printf ("%s\n", permstr (acls[i].a_perm)); printf ("%s\n", permstr (acls[i].a_perm));
} }
} }
return 0; return 0;
} }

12
winsup/utils/mkpasswd.c
View File

@ -42,7 +42,7 @@ put_sid (PSID sid)
return s; return s;
} }
void void
psx_dir (char *in, char *out) psx_dir (char *in, char *out)
{ {
if (isalpha (in[0]) && in[1] == ':') if (isalpha (in[0]) && in[1] == ':')
@ -65,7 +65,7 @@ psx_dir (char *in, char *out)
*out = '\0'; *out = '\0';
} }
void void
uni2ansi (LPWSTR wcs, char *mbs) uni2ansi (LPWSTR wcs, char *mbs)
{ {
if (wcs) if (wcs)
@ -75,7 +75,7 @@ uni2ansi (LPWSTR wcs, char *mbs)
*mbs = '\0'; *mbs = '\0';
} }
int int
enum_users (LPWSTR servername, int print_sids, int print_cygpath) enum_users (LPWSTR servername, int print_sids, int print_cygpath)
{ {
USER_INFO_3 *buffer; USER_INFO_3 *buffer;
@ -191,7 +191,7 @@ enum_users (LPWSTR servername, int print_sids, int print_cygpath)
return 0; return 0;
} }
int int
enum_local_groups (int print_sids) enum_local_groups (int print_sids)
{ {
LOCALGROUP_INFO_0 *buffer; LOCALGROUP_INFO_0 *buffer;
@ -277,7 +277,7 @@ enum_local_groups (int print_sids)
return 0; return 0;
} }
void void
usage () usage ()
{ {
fprintf (stderr, "\n"); fprintf (stderr, "\n");
@ -296,7 +296,7 @@ usage ()
exit (1); exit (1);
} }
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
LPWSTR servername = NULL; LPWSTR servername = NULL;

126
winsup/utils/module_info.cc
View File

@ -17,94 +17,96 @@ details. */
static int psapi_loaded = 0; static int psapi_loaded = 0;
static HMODULE psapi_module_handle = NULL; static HMODULE psapi_module_handle = NULL;
typedef BOOL WINAPI (tf_EnumProcessModules ) ( HANDLE, HMODULE*, DWORD, LPDWORD ); typedef BOOL WINAPI (tf_EnumProcessModules) (HANDLE, HMODULE *, DWORD,
typedef BOOL WINAPI (tf_GetModuleInformation) ( HANDLE, HMODULE, LPMODULEINFO, DWORD ); LPDWORD);
typedef DWORD WINAPI (tf_GetModuleFileNameExA) ( HANDLE, HMODULE, LPSTR, DWORD ); typedef BOOL WINAPI (tf_GetModuleInformation) (HANDLE, HMODULE, LPMODULEINFO,
DWORD);
typedef DWORD WINAPI (tf_GetModuleFileNameExA) (HANDLE, HMODULE, LPSTR,
DWORD);
static tf_EnumProcessModules *psapi_EnumProcessModules = NULL; static tf_EnumProcessModules *psapi_EnumProcessModules = NULL;
static tf_GetModuleInformation *psapi_GetModuleInformation = NULL; static tf_GetModuleInformation *psapi_GetModuleInformation = NULL;
static tf_GetModuleFileNameExA *psapi_GetModuleFileNameExA = NULL; static tf_GetModuleFileNameExA *psapi_GetModuleFileNameExA = NULL;
/* /* Returns full name of Dll, which is loaded by hProcess at BaseAddress.
* Returns full name of Dll, which is loaded by hProcess at BaseAddress Uses psapi.dll. */
* Uses psapi.dll
*/
char* char *
psapi_get_module_name ( HANDLE hProcess, DWORD BaseAddress ) psapi_get_module_name (HANDLE hProcess, DWORD BaseAddress)
{ {
DWORD len; DWORD len;
MODULEINFO mi; MODULEINFO mi;
unsigned int i; unsigned int i;
HMODULE dh_buf [ 1 ]; HMODULE dh_buf[1];
HMODULE* DllHandle = dh_buf; HMODULE *DllHandle = dh_buf;
DWORD cbNeeded; DWORD cbNeeded;
BOOL ok; BOOL ok;
char name_buf [ MAX_PATH + 1 ]; char name_buf[MAX_PATH + 1];
if ( !psapi_loaded || if (!psapi_loaded ||
psapi_EnumProcessModules == NULL || psapi_EnumProcessModules == NULL ||
psapi_GetModuleInformation == NULL || psapi_GetModuleInformation == NULL ||
psapi_GetModuleFileNameExA == NULL ) psapi_GetModuleFileNameExA == NULL)
{ {
if ( psapi_loaded ) goto failed; if (psapi_loaded)
goto failed;
psapi_loaded = 1; psapi_loaded = 1;
psapi_module_handle = LoadLibrary ( "psapi.dll" ); psapi_module_handle = LoadLibrary ("psapi.dll");
if ( ! psapi_module_handle ) if (!psapi_module_handle)
goto failed; goto failed;
psapi_EnumProcessModules = (tf_EnumProcessModules *) GetProcAddress ( psapi_module_handle, "EnumProcessModules" ); psapi_EnumProcessModules =
psapi_GetModuleInformation = (tf_GetModuleInformation *) GetProcAddress ( psapi_module_handle, "GetModuleInformation" ); (tf_EnumProcessModules *) GetProcAddress (psapi_module_handle,
psapi_GetModuleFileNameExA = (tf_GetModuleFileNameExA*) GetProcAddress ( psapi_module_handle, "GetModuleFileNameExA" ); "EnumProcessModules");
if ( psapi_EnumProcessModules == NULL || psapi_GetModuleInformation =
psapi_GetModuleInformation == NULL || (tf_GetModuleInformation *) GetProcAddress (psapi_module_handle,
psapi_GetModuleFileNameExA == NULL ) goto failed; "GetModuleInformation");
psapi_GetModuleFileNameExA =
(tf_GetModuleFileNameExA *) GetProcAddress (psapi_module_handle,
"GetModuleFileNameExA");
if (psapi_EnumProcessModules == NULL
|| psapi_GetModuleInformation == NULL
|| psapi_GetModuleFileNameExA == NULL)
goto failed;
} }
ok = (*psapi_EnumProcessModules) ( hProcess, ok = (*psapi_EnumProcessModules) (hProcess,
DllHandle, DllHandle, sizeof (HMODULE), &cbNeeded);
sizeof ( HMODULE ),
&cbNeeded );
if ( !ok || !cbNeeded ) goto failed; if (!ok || !cbNeeded)
DllHandle = (HMODULE*) malloc ( cbNeeded ); goto failed;
if ( ! DllHandle ) goto failed; DllHandle = (HMODULE *) malloc (cbNeeded);
ok = (*psapi_EnumProcessModules) ( hProcess, if (!DllHandle)
DllHandle, goto failed;
cbNeeded, ok = (*psapi_EnumProcessModules) (hProcess, DllHandle, cbNeeded, &cbNeeded);
&cbNeeded ); if (!ok)
if ( ! ok )
{ {
free ( DllHandle ); free (DllHandle);
goto failed; goto failed;
} }
for ( i = 0; i < cbNeeded / sizeof ( HMODULE ); i++ ) for (i = 0; i < cbNeeded / sizeof (HMODULE); i++)
{ {
if ( ! (*psapi_GetModuleInformation) ( hProcess, if (!(*psapi_GetModuleInformation) (hProcess,
DllHandle [ i ], DllHandle[i], &mi, sizeof (mi)))
&mi, {
sizeof ( mi ) ) ) free (DllHandle);
{ goto failed;
free ( DllHandle ); }
goto failed;
}
len = (*psapi_GetModuleFileNameExA) ( hProcess, len = (*psapi_GetModuleFileNameExA) (hProcess,
DllHandle [ i ], DllHandle[i], name_buf, MAX_PATH);
name_buf, if (len == 0)
MAX_PATH ); {
if ( len == 0 ) free (DllHandle);
{ goto failed;
free ( DllHandle ); }
goto failed;
}
if ( (DWORD) (mi.lpBaseOfDll) == BaseAddress ) if ((DWORD) (mi.lpBaseOfDll) == BaseAddress)
{ {
free ( DllHandle ); free (DllHandle);
return strdup ( name_buf ); return strdup (name_buf);
} }
} }
failed: failed:

6
winsup/utils/mount.cc
View File

@ -79,7 +79,7 @@ do_mount (const char *dev, const char *where, int flags)
{ {
if (force == FALSE) if (force == FALSE)
fprintf (stderr, "%s: warning: %s is not a directory.\n", progname, where); fprintf (stderr, "%s: warning: %s is not a directory.\n", progname, where);
} }
exit (0); exit (0);
} }
@ -167,7 +167,7 @@ main (int argc, const char **argv)
else else
usage (); usage ();
} }
if ((i + 2) != argc) if ((i + 2) != argc)
usage (); usage ();
@ -259,7 +259,7 @@ change_cygdrive_prefix (const char *new_prefix, int flags)
if (mount (NULL, new_prefix, flags)) if (mount (NULL, new_prefix, flags))
error (new_prefix); error (new_prefix);
exit (0); exit (0);
} }

75
winsup/utils/parse_pe.cc
View File

@ -4,11 +4,11 @@
Written by Egor Duda <deo@logos-m.ru> Written by Egor Duda <deo@logos-m.ru>
This file is part of Cygwin. This file is part of Cygwin.
This software is a copyrighted work licensed under the terms of the This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */ details. */
#include <bfd.h> #include <bfd.h>
#include <stdio.h> #include <stdio.h>
@ -17,22 +17,25 @@ details. */
#include "dumper.h" #include "dumper.h"
int int
exclusion::add ( LPBYTE mem_base, DWORD mem_size ) exclusion::add (LPBYTE mem_base, DWORD mem_size)
{ {
while ( last >= size ) size += step; while (last >= size)
region = (process_mem_region*) realloc ( region, size * sizeof ( process_mem_region ) ); size += step;
if ( region == NULL ) return 0; region = (process_mem_region *) realloc (region, size * sizeof (process_mem_region));
region [ last ].base = mem_base; if (region == NULL)
region [ last ].size = mem_size; return 0;
region[last].base = mem_base;
region[last].size = mem_size;
last++; last++;
return 1; return 1;
}; };
int cmp_regions ( const void* r1, const void* r2 ) int
cmp_regions (const void *r1, const void *r2)
{ {
if ( ((process_mem_region*) r1)->base < ((process_mem_region*) r2)->base ) if (((process_mem_region *) r1)->base < ((process_mem_region *) r2)->base)
return -1; return -1;
if ( ((process_mem_region*) r1)->base > ((process_mem_region*) r2)->base ) if (((process_mem_region *) r1)->base > ((process_mem_region *) r2)->base)
return 1; return 1;
return 0; return 0;
} }
@ -40,49 +43,49 @@ int cmp_regions ( const void* r1, const void* r2 )
int int
exclusion::sort_and_check () exclusion::sort_and_check ()
{ {
qsort ( region, last, sizeof ( process_mem_region ), &cmp_regions ); qsort (region, last, sizeof (process_mem_region), &cmp_regions);
for ( process_mem_region* p = region; p < region + last - 1; p++ ) for (process_mem_region * p = region; p < region + last - 1; p++)
{ {
process_mem_region* q = p + 1; process_mem_region *q = p + 1;
if ( p->base + size > q->base ) if (p->base + size > q->base)
{ {
fprintf ( stderr, "region error @ %08x", p->base ); fprintf (stderr, "region error @ %08x", p->base);
return 0; return 0;
} }
} }
return 1; return 1;
} }
static void static void
select_data_section ( bfd *abfd, asection *sect, PTR obj ) select_data_section (bfd * abfd, asection * sect, PTR obj)
{ {
exclusion* excl_list = (exclusion*) obj; exclusion *excl_list = (exclusion *) obj;
if ( ( sect->flags & ( SEC_CODE | SEC_DEBUGGING ) ) && if ((sect->flags & (SEC_CODE | SEC_DEBUGGING)) &&
sect->vma && sect->_raw_size ) sect->vma && sect->_raw_size)
{ {
excl_list->add ( (LPBYTE)sect->vma, (DWORD)sect->_raw_size ); excl_list->add ((LPBYTE) sect->vma, (DWORD) sect->_raw_size);
deb_printf ( "excluding section: %20s %08lx\n", sect->name, sect->_raw_size); deb_printf ("excluding section: %20s %08lx\n", sect->name, sect->_raw_size);
} }
} }
int int
parse_pe ( const char* file_name, exclusion* excl_list ) parse_pe (const char *file_name, exclusion * excl_list)
{ {
if ( file_name == NULL || excl_list == NULL ) return 0; if (file_name == NULL || excl_list == NULL)
return 0;
bfd* abfd = bfd_openr ( file_name, "pei-i386" ); bfd *abfd = bfd_openr (file_name, "pei-i386");
if ( abfd == NULL ) if (abfd == NULL)
{ {
bfd_perror ( "failed to open file" ); bfd_perror ("failed to open file");
return 0; return 0;
} }
bfd_check_format ( abfd, bfd_object ); bfd_check_format (abfd, bfd_object);
bfd_map_over_sections ( abfd, &select_data_section, (PTR)excl_list ); bfd_map_over_sections (abfd, &select_data_section, (PTR) excl_list);
excl_list->sort_and_check (); excl_list->sort_and_check ();
bfd_close ( abfd ); bfd_close (abfd);
return 1; return 1;
} }

4
winsup/utils/ssp.c
View File

@ -498,7 +498,7 @@ run_program (char *cmdline)
if (++qq % 100 == 0) if (++qq % 100 == 0)
fprintf (stderr, " %08x %d %d \r", fprintf (stderr, " %08x %d %d \r",
pc, ncalls, opcode_count); pc, ncalls, opcode_count);
if (sp == last_sp-4) if (sp == last_sp-4)
{ {
ncalls++; ncalls++;
@ -598,7 +598,7 @@ run_program (char *cmdline)
if (verbose) if (verbose)
printf ("load dll %08x:", printf ("load dll %08x:",
(int)event.u.LoadDll.lpBaseOfDll); (int)event.u.LoadDll.lpBaseOfDll);
dll_ptr = (char *)"( u n k n o w n ) \0\0"; dll_ptr = (char *)"( u n k n o w n ) \0\0";
if (event.u.LoadDll.lpImageName) if (event.u.LoadDll.lpImageName)
{ {

6
winsup/utils/ssp.txt
View File

@ -19,7 +19,7 @@ section. Let's say we're profiling cygwin1.dll. Make sure you've
built it with debug symbols (else gprof won't run) and run objdump built it with debug symbols (else gprof won't run) and run objdump
like this: like this:
objdump -h cygwin1.dll objdump -h cygwin1.dll
It will print a report like this: It will print a report like this:
@ -63,8 +63,8 @@ the first part of the report reports the amount of time spent in each
function, like this: function, like this:
Each sample counts as 0.01 seconds. Each sample counts as 0.01 seconds.
% cumulative self self total % cumulative self self total
time seconds seconds calls ms/call ms/call name time seconds seconds calls ms/call ms/call name
10.02 231.22 72.43 46 1574.57 1574.57 strcspn 10.02 231.22 72.43 46 1574.57 1574.57 strcspn
7.95 288.70 57.48 130 442.15 442.15 strncasematch 7.95 288.70 57.48 130 442.15 442.15 strncasematch

97
winsup/utils/strace.cc
View File

@ -30,17 +30,19 @@ static BOOL close_handle (HANDLE h, DWORD ok);
#define CloseHandle(h) close_handle(h, 0) #define CloseHandle(h) close_handle(h, 0)
struct child_list struct child_list
{
DWORD id;
HANDLE hproc;
int saw_stars;
char nfields;
long long start_time;
DWORD last_usecs;
struct child_list *next;
child_list ():id (0), hproc (NULL), saw_stars (0), nfields (0),
start_time (0), last_usecs (0), next (NULL)
{ {
DWORD id; }
HANDLE hproc; };
int saw_stars;
char nfields;
long long start_time;
DWORD last_usecs;
struct child_list *next;
child_list () : id (0), hproc (NULL), saw_stars (0), nfields (0),
start_time (0), last_usecs (0), next (NULL) {}
};
child_list children; child_list children;
@ -85,7 +87,7 @@ DWORD lastid = 0;
HANDLE lasth; HANDLE lasth;
#define PROCFLAGS \ #define PROCFLAGS \
PROCESS_ALL_ACCESS /*(PROCESS_DUP_HANDLE | PROCESS_TERMINATE | PROCESS_VM_READ | PROCESS_VM_WRITE)*/ PROCESS_ALL_ACCESS /*(PROCESS_DUP_HANDLE | PROCESS_TERMINATE | PROCESS_VM_READ | PROCESS_VM_WRITE) */
static void static void
add_child (DWORD id, HANDLE hproc) add_child (DWORD id, HANDLE hproc)
{ {
@ -101,7 +103,7 @@ static child_list *
get_child (DWORD id) get_child (DWORD id)
{ {
child_list *c; child_list *c;
for (c = &children; (c = c->next) != NULL; ) for (c = &children; (c = c->next) != NULL;)
if (c->id == id) if (c->id == id)
return c; return c;
@ -132,7 +134,7 @@ class linebuf
{ {
size_t alloc; size_t alloc;
public: public:
size_t ix; size_t ix;
char *buf; char *buf;
linebuf () linebuf ()
{ {
@ -140,9 +142,16 @@ public:
alloc = 0; alloc = 0;
buf = NULL; buf = NULL;
} }
~linebuf () {if (buf) free (buf);} ~linebuf ()
{
if (buf)
free (buf);
}
void add (const char *what, int len); void add (const char *what, int len);
void add (const char *what) {add (what, strlen (what));} void add (const char *what)
{
add (what, strlen (what));
}
void prepend (const char *what, int len); void prepend (const char *what, int len);
}; };
@ -172,15 +181,15 @@ linebuf::prepend (const char *what, int len)
buf[ix] = '\0'; buf[ix] = '\0';
} }
if ((buflen = strlen (buf))) if ((buflen = strlen (buf)))
memmove (buf + len, buf, buflen + 1); memmove (buf + len, buf, buflen + 1);
else else
buf[newix] = '\0'; buf[newix] = '\0';
memcpy (buf, what, len); memcpy (buf, what, len);
ix = newix; ix = newix;
} }
static void static void
make_command_line (linebuf& one_line, char **argv) make_command_line (linebuf & one_line, char **argv)
{ {
for (; *argv; argv++) for (; *argv; argv++)
{ {
@ -240,26 +249,25 @@ create_child (char **argv)
memset (&si, 0, sizeof (si)); memset (&si, 0, sizeof (si));
si.cb = sizeof (si); si.cb = sizeof (si);
/* cygwin32_conv_to_win32_path (exec_file, real_path);*/ /* cygwin32_conv_to_win32_path (exec_file, real_path); */
flags = forkdebug ? 0 : DEBUG_ONLY_THIS_PROCESS; flags = forkdebug ? 0 : DEBUG_ONLY_THIS_PROCESS;
flags |= /*CREATE_NEW_PROCESS_GROUP | */CREATE_DEFAULT_ERROR_MODE | DEBUG_PROCESS; flags |=
/*CREATE_NEW_PROCESS_GROUP | */ CREATE_DEFAULT_ERROR_MODE | DEBUG_PROCESS;
make_command_line (one_line, argv); make_command_line (one_line, argv);
SetConsoleCtrlHandler (NULL, 0); SetConsoleCtrlHandler (NULL, 0);
ret = CreateProcess (0, ret = CreateProcess (0, one_line.buf, /* command line */
one_line.buf,/* command line */
NULL, /* Security */ NULL, /* Security */
NULL, /* thread */ NULL, /* thread */
TRUE, /* inherit handles */ TRUE, /* inherit handles */
flags, /* start flags */ flags, /* start flags */
NULL, NULL, NULL, /* current directory */
NULL, /* current directory */ &si, &pi);
&si,
&pi);
if (!ret) if (!ret)
error (0, "error creating process %s, (error %d)", *argv, GetLastError()); error (0, "error creating process %s, (error %d)", *argv,
GetLastError ());
CloseHandle (pi.hThread); CloseHandle (pi.hThread);
CloseHandle (pi.hProcess); CloseHandle (pi.hProcess);
@ -294,9 +302,7 @@ output_winerror (FILE *ofile, char *s)
NULL, NULL,
errnum, errnum,
MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPTSTR) buf, (LPTSTR) buf, sizeof (buf), NULL))
sizeof (buf),
NULL))
return 0; return 0;
/* Get rid the trailing CR/NL pair. */ /* Get rid the trailing CR/NL pair. */
@ -331,7 +337,7 @@ handle_output_debug_string (DWORD id, LPVOID p, unsigned mask, FILE *ofile)
DWORD nbytes; DWORD nbytes;
child_list *child = get_child (id); child_list *child = get_child (id);
HANDLE hchild = child->hproc; HANDLE hchild = child->hproc;
#define INTROLEN (sizeof (alen) - 1) #define INTROLEN (sizeof (alen) - 1)
if (id == lastid && hchild != lasth) if (id == lastid && hchild != lasth)
warn (0, "%p != %p", hchild, lasth); warn (0, "%p != %p", hchild, lasth);
@ -341,7 +347,8 @@ handle_output_debug_string (DWORD id, LPVOID p, unsigned mask, FILE *ofile)
#ifndef DEBUGGING #ifndef DEBUGGING
return; return;
#else #else
error (0, "couldn't get message length from subprocess %d<%p>, windows error %d", error (0,
"couldn't get message length from subprocess %d<%p>, windows error %d",
id, hchild, GetLastError ()); id, hchild, GetLastError ());
#endif #endif
@ -378,8 +385,9 @@ handle_output_debug_string (DWORD id, LPVOID p, unsigned mask, FILE *ofile)
{ {
DWORD new_flag = 1; DWORD new_flag = 1;
if (!WriteProcessMemory (hchild, (LPVOID) n, &new_flag, if (!WriteProcessMemory (hchild, (LPVOID) n, &new_flag,
sizeof (new_flag), &nbytes)) sizeof (new_flag), &nbytes))
error (0, "couldn't write strace flag to subprocess, windows error %d", error (0,
"couldn't write strace flag to subprocess, windows error %d",
GetLastError ()); GetLastError ());
return; return;
} }
@ -387,9 +395,9 @@ handle_output_debug_string (DWORD id, LPVOID p, unsigned mask, FILE *ofile)
char *origs = s; char *origs = s;
if (mask & n) if (mask & n)
/* got it */; /* got it */ ;
else if (!(mask & _STRACE_ALL) || (n & _STRACE_NOTALL)) else if (!(mask & _STRACE_ALL) || (n & _STRACE_NOTALL))
return; /* This should not be included in "all" output */ return; /* This should not be included in "all" output */
DWORD dusecs, usecs; DWORD dusecs, usecs;
char *ptusec, *ptrest; char *ptusec, *ptrest;
@ -447,7 +455,7 @@ handle_output_debug_string (DWORD id, LPVOID p, unsigned mask, FILE *ofile)
{ {
for (i = 0; i < child->nfields; i++) for (i = 0; i < child->nfields; i++)
if ((news = strchr (news, ' ')) == NULL) if ((news = strchr (news, ' ')) == NULL)
break; // Should never happen break; // Should never happen
else else
news++; news++;
@ -459,8 +467,10 @@ handle_output_debug_string (DWORD id, LPVOID p, unsigned mask, FILE *ofile)
if (*s == '*') if (*s == '*')
{ {
SYSTEMTIME *st = syst (child->start_time); SYSTEMTIME *st = syst (child->start_time);
fprintf (ofile, "Date/Time: %d-%02d-%02d %02d:%02d:%02d\n", fprintf (ofile,
st->wYear, st->wMonth, st->wDay, st->wHour, st->wMinute, st->wSecond); "Date/Time: %d-%02d-%02d %02d:%02d:%02d\n",
st->wYear, st->wMonth, st->wDay, st->wHour,
st->wMinute, st->wSecond);
child->saw_stars++; child->saw_stars++;
} }
} }
@ -471,7 +481,7 @@ handle_output_debug_string (DWORD id, LPVOID p, unsigned mask, FILE *ofile)
char intbuf[40]; char intbuf[40];
if (child->saw_stars < 2 || s != origs) if (child->saw_stars < 2 || s != origs)
/* Nothing */; /* Nothing */ ;
else if (hhmmss) else if (hhmmss)
{ {
s = ptrest - 9; s = ptrest - 9;
@ -537,7 +547,8 @@ proc_child (unsigned mask, FILE *ofile)
remove_child (ev.dwProcessId); remove_child (ev.dwProcessId);
break; break;
case EXCEPTION_DEBUG_EVENT: case EXCEPTION_DEBUG_EVENT:
if (ev.u.Exception.ExceptionRecord.ExceptionCode != STATUS_BREAKPOINT) if (ev.u.Exception.ExceptionRecord.ExceptionCode !=
STATUS_BREAKPOINT)
{ {
status = DBG_EXCEPTION_NOT_HANDLED; status = DBG_EXCEPTION_NOT_HANDLED;
#if 0 #if 0
@ -566,7 +577,7 @@ dostrace (unsigned mask, FILE *ofile, char **argv)
} }
int int
main(int argc, char **argv) main (int argc, char **argv)
{ {
unsigned mask = 0; unsigned mask = 0;
FILE *ofile = NULL; FILE *ofile = NULL;
@ -627,7 +638,7 @@ static BOOL
close_handle (HANDLE h, DWORD ok) close_handle (HANDLE h, DWORD ok)
{ {
child_list *c; child_list *c;
for (c = &children; (c = c->next) != NULL; ) for (c = &children; (c = c->next) != NULL;)
if (c->hproc == h && c->id != ok) if (c->hproc == h && c->id != ok)
error (0, "Closing child handle %p", h); error (0, "Closing child handle %p", h);
return CloseHandle (h); return CloseHandle (h);

19
winsup/utils/umount.cc
View File

@ -27,13 +27,18 @@ static void
usage (void) usage (void)
{ {
fprintf (stderr, "Usage %s [-s] <posixpath>\n", progname); fprintf (stderr, "Usage %s [-s] <posixpath>\n", progname);
fprintf (stderr, "-s = remove mount point from system-wide registry location\n"); fprintf (stderr,
"-s = remove mount point from system-wide registry location\n");
fprintf (stderr, "\n"); fprintf (stderr, "\n");
fprintf (stderr, "--remove-all-mounts = remove all mounts\n"); fprintf (stderr, "--remove-all-mounts = remove all mounts\n");
fprintf (stderr, "--remove-auto-mounts = remove all automatically mounted mounts\n"); fprintf (stderr,
fprintf (stderr, "--remove-user-mounts = remove all mounts in the current user mount registry area, including auto mounts\n"); "--remove-auto-mounts = remove all automatically mounted mounts\n");
fprintf (stderr, "--remove-system-mounts = remove all mounts in the system-wide mount registry area\n"); fprintf (stderr,
fprintf (stderr, "[-s] --remove-cygdrive-prefix = remove cygdrive path prefix\n"); "--remove-user-mounts = remove all mounts in the current user mount registry area, including auto mounts\n");
fprintf (stderr,
"--remove-system-mounts = remove all mounts in the system-wide mount registry area\n");
fprintf (stderr,
"[-s] --remove-cygdrive-prefix = remove cygdrive path prefix\n");
exit (1); exit (1);
} }
@ -57,7 +62,7 @@ main (int argc, char **argv)
for (i = 1; i < argc; ++i) for (i = 1; i < argc; ++i)
{ {
if (argv[i][0] != '-') if (argv[i][0] != '-')
break; break;
if (strcmp (argv[i], "-s") == 0) if (strcmp (argv[i], "-s") == 0)
{ {
@ -194,7 +199,7 @@ remove_all_system_mounts ()
static void static void
remove_cygdrive_prefix (int flags) remove_cygdrive_prefix (int flags)
{ {
int res = cygwin_umount(NULL, flags | MOUNT_AUTO); int res = cygwin_umount (NULL, flags | MOUNT_AUTO);
if (res) if (res)
error ("remove_cygdrive_prefix"); error ("remove_cygdrive_prefix");
} }

18
winsup/utils/utils.sgml
View File

@ -269,7 +269,7 @@ local machine or the default (or given) domain.</para>
<screen> <screen>
Usage passwd [name] Usage passwd [name]
passwd [-x max] [-n min] [-i inact] [-L len] passwd [-x max] [-n min] [-i inact] [-L len]
passwd {-l|-u|-S} name passwd {-l|-u|-S} name
-x max set max age of passwords -x max set max age of passwords
-n min set min age of passwords -n min set min age of passwords
@ -303,12 +303,12 @@ at this time. If not, <command>passwd</command> refuses to change the
password and exits.</para> password and exits.</para>
<para>Password expiry and length: The password aging information may be <para>Password expiry and length: The password aging information may be
changed by the administrators with the <literal>-x</literal>, changed by the administrators with the <literal>-x</literal>,
<literal>-n</literal> and <literal>-i</literal> options. The <literal>-n</literal> and <literal>-i</literal> options. The
<literal>-x</literal> option is used to set the maximum number of days <literal>-x</literal> option is used to set the maximum number of days
a password remains valid. After <emphasis>max</emphasis> days, the a password remains valid. After <emphasis>max</emphasis> days, the
password is required to be changed. The <literal>-n</literal> option is password is required to be changed. The <literal>-n</literal> option is
used to set the minimum number of days before a password may be changed. used to set the minimum number of days before a password may be changed.
The user will not be permitted to change the password until The user will not be permitted to change the password until
<emphasis>min</emphasis> days have elapsed. The <literal>-i</literal> <emphasis>min</emphasis> days have elapsed. The <literal>-i</literal>
option is used to disable an account after the password has been expired option is used to disable an account after the password has been expired
@ -321,8 +321,8 @@ for users, which doesn't belong to the administrators group, to
password length are 0 to 14. In any of the above cases, a value of 0 password length are 0 to 14. In any of the above cases, a value of 0
means `no restrictions'.</para> means `no restrictions'.</para>
<para>Account maintenance: User accounts may be locked and unlocked with the <para>Account maintenance: User accounts may be locked and unlocked with the
<literal>-l</literal> and <literal>-u</literal> flags. The <literal>-l</literal> and <literal>-u</literal> flags. The
<literal>-l</literal> option disables an account. The <literal>-u</literal> <literal>-l</literal> option disables an account. The <literal>-u</literal>
option re-enables an account.</para> option re-enables an account.</para>
@ -383,9 +383,9 @@ to the current user.</para>
<para>The <command>mount</command> utility is also the mechanism for <para>The <command>mount</command> utility is also the mechanism for
adding new mounts to the mount table. The following example adding new mounts to the mount table. The following example
demonstrates how to mount the directory demonstrates how to mount the directory
<filename>C:\cygnus\cygwin-b20\H-i586-cygwin32\bin</filename> <filename>C:\cygnus\cygwin-b20\H-i586-cygwin32\bin</filename>
to <filename>/bin</filename> and the network directory to <filename>/bin</filename> and the network directory
<filename>\\pollux\home\joe\data</filename> to <filename>/data</filename>. <filename>\\pollux\home\joe\data</filename> to <filename>/data</filename>.
<filename>/bin</filename> is assumed to already exist.</para> <filename>/bin</filename> is assumed to already exist.</para>
@ -423,7 +423,7 @@ instead of the user-specific one. System-wide mounts are displayed
by <command>mount</command> as being of the "system" type, as is the by <command>mount</command> as being of the "system" type, as is the
case for the <filename>/</filename> partition in the last example. case for the <filename>/</filename> partition in the last example.
Under Windows NT, only those users with Administrator priviledges are Under Windows NT, only those users with Administrator priviledges are
permitted to modify the system-wide mount table.</para> permitted to modify the system-wide mount table.</para>
<para>Note that a given POSIX path may only exist once in the user <para>Note that a given POSIX path may only exist once in the user
table and once in the global, system-wide table. Attempts to replace table and once in the global, system-wide table. Attempts to replace