libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-22 00:38:06 +08:00
Code Issues Projects Releases Wiki Activity

* path.cc: Perform some whitespace fixups throughout.

Browse Source
This commit is contained in:
Christopher Faylor 2012-07-02 00:40:06 +00:00
parent ca4d966d1b
commit c4441d46b6
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
2012-07-01 Christopher Faylor <me.cygwin2012@cgf.cx>
* path.cc: Perform some whitespace fixups throughout.
2012-06-28 Corinna Vinschen <corinna@vinschen.de> 2012-06-28 Corinna Vinschen <corinna@vinschen.de>
* kernel32.cc (_KERNEL32_): Define. Explain why. * kernel32.cc (_KERNEL32_): Define. Explain why.

39
winsup/cygwin/path.cc
View File

@ -112,7 +112,8 @@ muto NO_COPY cwdstuff::cwd_lock;
static const GUID GUID_shortcut static const GUID GUID_shortcut
= { 0x00021401L, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46}}; = { 0x00021401L, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46}};
enum { enum
{
WSH_FLAG_IDLIST = 0x01, /* Contains an ITEMIDLIST. */ WSH_FLAG_IDLIST = 0x01, /* Contains an ITEMIDLIST. */
WSH_FLAG_FILE = 0x02, /* Contains a file locator element. */ WSH_FLAG_FILE = 0x02, /* Contains a file locator element. */
WSH_FLAG_DESC = 0x04, /* Contains a description. */ WSH_FLAG_DESC = 0x04, /* Contains a description. */
@ -123,24 +124,24 @@ enum {
}; };
struct win_shortcut_hdr struct win_shortcut_hdr
{ {
DWORD size; /* Header size in bytes. Must contain 0x4c. */ DWORD size; /* Header size in bytes. Must contain 0x4c. */
GUID magic; /* GUID of shortcut files. */ GUID magic; /* GUID of shortcut files. */
DWORD flags; /* Content flags. See above. */ DWORD flags; /* Content flags. See above. */
/* The next fields from attr to icon_no are always set to 0 in Cygwin /* The next fields from attr to icon_no are always set to 0 in Cygwin
and U/Win shortcuts. */ and U/Win shortcuts. */
DWORD attr; /* Target file attributes. */ DWORD attr; /* Target file attributes. */
FILETIME ctime; /* These filetime items are never touched by the */ FILETIME ctime; /* These filetime items are never touched by the */
FILETIME mtime; /* system, apparently. Values don't matter. */ FILETIME mtime; /* system, apparently. Values don't matter. */
FILETIME atime; FILETIME atime;
DWORD filesize; /* Target filesize. */ DWORD filesize; /* Target filesize. */
DWORD icon_no; /* Icon number. */ DWORD icon_no; /* Icon number. */
DWORD run; /* Values defined in winuser.h. Use SW_NORMAL. */ DWORD run; /* Values defined in winuser.h. Use SW_NORMAL. */
DWORD hotkey; /* Hotkey value. Set to 0. */ DWORD hotkey; /* Hotkey value. Set to 0. */
DWORD dummy[2]; /* Future extension probably. Always 0. */ DWORD dummy[2]; /* Future extension probably. Always 0. */
}; };
/* Return non-zero if PATH1 is a prefix of PATH2. /* Return non-zero if PATH1 is a prefix of PATH2.
Both are assumed to be of the same path style and / vs \ usage. Both are assumed to be of the same path style and / vs \ usage.
@ -1351,8 +1352,8 @@ normalize_win32_path (const char *src, char *dst, char *&tail)
if ((tail - dst) >= NT_MAX_PATH) if ((tail - dst) >= NT_MAX_PATH)
return ENAMETOOLONG; return ENAMETOOLONG;
} }
if (tail > dst + 1 && tail[-1] == '.' && tail[-2] == '\\') if (tail > dst + 1 && tail[-1] == '.' && tail[-2] == '\\')
tail--; tail--;
*tail = '\0'; *tail = '\0';
debug_printf ("%s = normalize_win32_path (%s)", dst, src_start); debug_printf ("%s = normalize_win32_path (%s)", dst, src_start);
return 0; return 0;