From 0764e5b934b6b2d0fbb636b3a045caaabb636f4e Mon Sep 17 00:00:00 2001 From: Kurtis Rader Date: Thu, 21 Jun 2018 14:53:17 -0700 Subject: [PATCH] Cygwin lint cleanups --- meson.build | 2 +- src/cmd/ksh93/bltins/test.c | 2 +- src/cmd/ksh93/sh/macro.c | 3 +- src/lib/libast/path/pathprog.c | 16 ++-- src/lib/libast/string/strgid.c | 9 ++- src/lib/libast/tm/tmlocale.c | 130 ++++++++++++--------------------- 6 files changed, 64 insertions(+), 98 deletions(-) diff --git a/meson.build b/meson.build index 40f86cfac4e1..d3c316efc71e 100644 --- a/meson.build +++ b/meson.build @@ -112,7 +112,7 @@ osname = hosttype.split('.')[0] feature_data.set_quoted('HOSTTYPE', hosttype) feature_data.set_quoted('OSNAME', osname) # Some systems, like FreeBSD, have a different signature for the fts_open() comparison function. -feature_data.set10('const_const_fts_open', osname == 'freebsd') +feature_data.set10('const_const_fts_open', osname == 'freebsd' or osname == 'cygwin') feature_data.set('_ast_sizeof_int', int_size) diff --git a/src/cmd/ksh93/bltins/test.c b/src/cmd/ksh93/bltins/test.c index 0df4113a4fc0..4ad45ed64949 100644 --- a/src/cmd/ksh93/bltins/test.c +++ b/src/cmd/ksh93/bltins/test.c @@ -47,7 +47,7 @@ ((p)->st_mode & (S_IRUSR | S_IWUSR)) != (S_IRUSR | S_IWUSR)))) #else // _socketpair_shutdown_mode #define isapipe(f, p) \ - (test_stat(f, p) >= 0 && (S_ISFIFO((p)->st_mode) || S_ISSOCK((p)->st_mode) && (p)->st_ino)) + (test_stat(f, p) >= 0 && (S_ISFIFO((p)->st_mode) || (S_ISSOCK((p)->st_mode) && (p)->st_ino))) #endif // _socketpair_shutdown_mode #else //_pipe_socketpair #define isapipe(f, p) \ diff --git a/src/cmd/ksh93/sh/macro.c b/src/cmd/ksh93/sh/macro.c index 7c804471c88d..c8bb52c0a60e 100644 --- a/src/cmd/ksh93/sh/macro.c +++ b/src/cmd/ksh93/sh/macro.c @@ -2442,7 +2442,8 @@ static_fn char *sh_tilde(Shell_t *shp, const char *string) { str = stkseek(shp->stk, offset); Skip = n; if (logins_tree && (np = nv_search(str, logins_tree, 0))) return nv_getval(np); - if (pw = getpwnam(str)) { + pw = getpwnam(str); + if (pw) { string = str; goto skip; } diff --git a/src/lib/libast/path/pathprog.c b/src/lib/libast/path/pathprog.c index a5bf32ef3114..d867082f4b18 100644 --- a/src/lib/libast/path/pathprog.c +++ b/src/lib/libast/path/pathprog.c @@ -66,22 +66,24 @@ static size_t prog(const char *command, char *path, size_t size) { if (!_NSGetExecutablePath(path, &z) && *path == '/') return strlen(path); #endif #if __CYGWIN__ - if (s = GetCommandLine()) { + s = GetCommandLine(); + if (s) { n = 0; q = 0; t = path; e = path + size - 1; - while (c = *s++) { - if (c == q) + while ((c = *s++)) { + if (c == q) { q = 0; - else if (!q && c == '"') + } else if (!q && c == '"') { q = c; - else if (!q && isspace(c)) + } else if (!q && isspace(c)) { break; - else if (t < e) + } else if (t < e) { *t++ = c == '\\' ? '/' : c; - else + } else { n++; + } } if (t < e) *t = 0; return (t - path) + n; diff --git a/src/lib/libast/string/strgid.c b/src/lib/libast/string/strgid.c index c5feac688bf5..4094a4d6e64c 100644 --- a/src/lib/libast/string/strgid.c +++ b/src/lib/libast/string/strgid.c @@ -93,14 +93,15 @@ int strgid(const char *name) { #if __CYGWIN__ if (!*e) { if (!getgrgid(id)) id = -1; - } else if (!streq(name, "sys")) + } else if (!streq(name, "sys")) { id = -1; - else if (gr = getgrnam("Administrators")) + } else if ((gr = getgrnam("Administrators"))) { id = gr->gr_gid; - else if (pw = getpwnam("Administrator")) + } else if ((pw = getpwnam("Administrator"))) { id = pw->pw_gid; - else + } else { id = -1; + } #else if (*e || !getgrgid(id)) id = -1; #endif diff --git a/src/lib/libast/tm/tmlocale.c b/src/lib/libast/tm/tmlocale.c index b9ebe59df1e1..989b7a35ec45 100644 --- a/src/lib/libast/tm/tmlocale.c +++ b/src/lib/libast/tm/tmlocale.c @@ -102,86 +102,46 @@ typedef struct Map_s { } Map_t; static const Map_t map[] = { - LOCALE_S1159, - (TM_MERIDIAN + 0), - LOCALE_S2359, - (TM_MERIDIAN + 1), - LOCALE_SABBREVDAYNAME1, - (TM_DAY_ABBREV + 1), - LOCALE_SABBREVDAYNAME2, - (TM_DAY_ABBREV + 2), - LOCALE_SABBREVDAYNAME3, - (TM_DAY_ABBREV + 3), - LOCALE_SABBREVDAYNAME4, - (TM_DAY_ABBREV + 4), - LOCALE_SABBREVDAYNAME5, - (TM_DAY_ABBREV + 5), - LOCALE_SABBREVDAYNAME6, - (TM_DAY_ABBREV + 6), - LOCALE_SABBREVDAYNAME7, - (TM_DAY_ABBREV + 0), - LOCALE_SABBREVMONTHNAME1, - (TM_MONTH_ABBREV + 0), - LOCALE_SABBREVMONTHNAME2, - (TM_MONTH_ABBREV + 1), - LOCALE_SABBREVMONTHNAME3, - (TM_MONTH_ABBREV + 2), - LOCALE_SABBREVMONTHNAME4, - (TM_MONTH_ABBREV + 3), - LOCALE_SABBREVMONTHNAME5, - (TM_MONTH_ABBREV + 4), - LOCALE_SABBREVMONTHNAME6, - (TM_MONTH_ABBREV + 5), - LOCALE_SABBREVMONTHNAME7, - (TM_MONTH_ABBREV + 6), - LOCALE_SABBREVMONTHNAME8, - (TM_MONTH_ABBREV + 7), - LOCALE_SABBREVMONTHNAME9, - (TM_MONTH_ABBREV + 8), - LOCALE_SABBREVMONTHNAME10, - (TM_MONTH_ABBREV + 9), - LOCALE_SABBREVMONTHNAME11, - (TM_MONTH_ABBREV + 10), - LOCALE_SABBREVMONTHNAME12, - (TM_MONTH_ABBREV + 11), - LOCALE_SDAYNAME1, - (TM_DAY + 1), - LOCALE_SDAYNAME2, - (TM_DAY + 2), - LOCALE_SDAYNAME3, - (TM_DAY + 3), - LOCALE_SDAYNAME4, - (TM_DAY + 4), - LOCALE_SDAYNAME5, - (TM_DAY + 5), - LOCALE_SDAYNAME6, - (TM_DAY + 6), - LOCALE_SDAYNAME7, - (TM_DAY + 0), - LOCALE_SMONTHNAME1, - (TM_MONTH + 0), - LOCALE_SMONTHNAME2, - (TM_MONTH + 1), - LOCALE_SMONTHNAME3, - (TM_MONTH + 2), - LOCALE_SMONTHNAME4, - (TM_MONTH + 3), - LOCALE_SMONTHNAME5, - (TM_MONTH + 4), - LOCALE_SMONTHNAME6, - (TM_MONTH + 5), - LOCALE_SMONTHNAME7, - (TM_MONTH + 6), - LOCALE_SMONTHNAME8, - (TM_MONTH + 7), - LOCALE_SMONTHNAME9, - (TM_MONTH + 8), - LOCALE_SMONTHNAME10, - (TM_MONTH + 9), - LOCALE_SMONTHNAME11, - (TM_MONTH + 10), - LOCALE_SMONTHNAME12, - (TM_MONTH + 11), + {LOCALE_S1159, (TM_MERIDIAN + 0)}, + {LOCALE_S2359, (TM_MERIDIAN + 1)}, + {LOCALE_SABBREVDAYNAME1, (TM_DAY_ABBREV + 1)}, + {LOCALE_SABBREVDAYNAME2, (TM_DAY_ABBREV + 2)}, + {LOCALE_SABBREVDAYNAME3, (TM_DAY_ABBREV + 3)}, + {LOCALE_SABBREVDAYNAME4, (TM_DAY_ABBREV + 4)}, + {LOCALE_SABBREVDAYNAME5, (TM_DAY_ABBREV + 5)}, + {LOCALE_SABBREVDAYNAME6, (TM_DAY_ABBREV + 6)}, + {LOCALE_SABBREVDAYNAME7, (TM_DAY_ABBREV + 0)}, + {LOCALE_SABBREVMONTHNAME1, (TM_MONTH_ABBREV + 0)}, + {LOCALE_SABBREVMONTHNAME2, (TM_MONTH_ABBREV + 1)}, + {LOCALE_SABBREVMONTHNAME3, (TM_MONTH_ABBREV + 2)}, + {LOCALE_SABBREVMONTHNAME4, (TM_MONTH_ABBREV + 3)}, + {LOCALE_SABBREVMONTHNAME5, (TM_MONTH_ABBREV + 4)}, + {LOCALE_SABBREVMONTHNAME6, (TM_MONTH_ABBREV + 5)}, + {LOCALE_SABBREVMONTHNAME7, (TM_MONTH_ABBREV + 6)}, + {LOCALE_SABBREVMONTHNAME8, (TM_MONTH_ABBREV + 7)}, + {LOCALE_SABBREVMONTHNAME9, (TM_MONTH_ABBREV + 8)}, + {LOCALE_SABBREVMONTHNAME10, (TM_MONTH_ABBREV + 9)}, + {LOCALE_SABBREVMONTHNAME11, (TM_MONTH_ABBREV + 10)}, + {LOCALE_SABBREVMONTHNAME12, (TM_MONTH_ABBREV + 11)}, + {LOCALE_SDAYNAME1, (TM_DAY + 1)}, + {LOCALE_SDAYNAME2, (TM_DAY + 2)}, + {LOCALE_SDAYNAME3, (TM_DAY + 3)}, + {LOCALE_SDAYNAME4, (TM_DAY + 4)}, + {LOCALE_SDAYNAME5, (TM_DAY + 5)}, + {LOCALE_SDAYNAME6, (TM_DAY + 6)}, + {LOCALE_SDAYNAME7, (TM_DAY + 0)}, + {LOCALE_SMONTHNAME1, (TM_MONTH + 0)}, + {LOCALE_SMONTHNAME2, (TM_MONTH + 1)}, + {LOCALE_SMONTHNAME3, (TM_MONTH + 2)}, + {LOCALE_SMONTHNAME4, (TM_MONTH + 3)}, + {LOCALE_SMONTHNAME5, (TM_MONTH + 4)}, + {LOCALE_SMONTHNAME6, (TM_MONTH + 5)}, + {LOCALE_SMONTHNAME7, (TM_MONTH + 6)}, + {LOCALE_SMONTHNAME8, (TM_MONTH + 7)}, + {LOCALE_SMONTHNAME9, (TM_MONTH + 8)}, + {LOCALE_SMONTHNAME10, (TM_MONTH + 9)}, + {LOCALE_SMONTHNAME11, (TM_MONTH + 10)}, + {LOCALE_SMONTHNAME12, (TM_MONTH + 11)}, }; /* @@ -368,13 +328,15 @@ static void native_lc_time(Lc_info_t *li) { *s++ = '%'; if (!leading_0) *s++ = '-'; *s++ = clock_24 ? 'H' : 'I'; - for (t = buf; *s = *t++; s++) - ; + for (t = buf; (*s = *t++); s++) { + ; // empty loop + } *s++ = '%'; if (!leading_0) *s++ = '-'; *s++ = 'M'; - for (t = buf; *s = *t++; s++) - ; + for (t = buf; (*s = *t++); s++) { + ; // empty loop + } *s++ = '%'; if (!leading_0) *s++ = '-'; *s++ = 'S';