From 5df5a4772a7230b1d5467ce5fb0740c190457a30 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 29 Jun 2010 12:45:11 -0400 Subject: [PATCH] Include strings.h even if string.h exists since they may define different things. Fixes warnings on AIX and others. --HG-- branch : 1.7 --- alias.c | 7 +- alloc.c | 9 ++- auth/afs.c | 9 ++- auth/aix_auth.c | 9 ++- auth/bsdauth.c | 10 +-- auth/dce.c | 10 +-- auth/fwtk.c | 10 +-- auth/kerb4.c | 10 +-- auth/kerb5.c | 10 +-- auth/pam.c | 12 ++-- auth/passwd.c | 10 +-- auth/rfc1938.c | 9 ++- auth/secureware.c | 9 ++- auth/securid.c | 10 +-- auth/securid5.c | 10 +-- auth/sia.c | 10 +-- auth/sudo_auth.c | 12 ++-- boottime.c | 10 +-- check.c | 7 +- defaults.c | 7 +- env.c | 7 +- exec.c | 10 +-- exec_pty.c | 7 +- fileops.c | 7 +- find_path.c | 7 +- fnmatch.c | 9 ++- get_pty.c | 7 +- getcwd.c | 7 +- getdate.c | 91 ++++++++++++------------ getdate.y | 7 +- getline.c | 9 ++- getspwuid.c | 13 ++-- glob.c | 9 ++- goodpath.c | 10 +-- gram.c | 175 +++++++++++++++++++++++----------------------- gram.y | 7 +- interfaces.c | 9 ++- iolog.c | 7 +- lbuf.c | 7 +- ldap.c | 7 +- logging.c | 7 +- match.c | 7 +- parse.c | 7 +- parse_args.c | 10 +-- pwutil.c | 9 ++- set_perms.c | 7 +- snprintf.c | 10 +-- sudo.c | 7 +- sudo_edit.c | 7 +- sudo_nss.c | 7 +- sudoreplay.c | 7 +- term.c | 7 +- testsudoers.c | 9 ++- tgetpass.c | 7 +- toke.c | 121 ++++++++++++++++---------------- toke.l | 7 +- tsgetgrpw.c | 7 +- visudo.c | 7 +- 58 files changed, 397 insertions(+), 455 deletions(-) diff --git a/alias.c b/alias.c index c44636ab7..b1f57e7ec 100644 --- a/alias.c +++ b/alias.c @@ -32,10 +32,9 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif +#endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include #endif /* HAVE_STRING_H */ #ifdef HAVE_UNISTD_H # include diff --git a/alloc.c b/alloc.c index d8bd857ce..8e6a7e262 100644 --- a/alloc.c +++ b/alloc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2005, 2007 + * Copyright (c) 1999-2005, 2007, 2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any @@ -34,10 +34,9 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif +#endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include #endif /* HAVE_STRING_H */ #if defined(HAVE_MALLOC_H) && !defined(STDC_HEADERS) # include diff --git a/auth/afs.c b/auth/afs.c index 337cd4d20..2b9d7b9bf 100644 --- a/auth/afs.c +++ b/auth/afs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001-2005, 2007 + * Copyright (c) 1999, 2001-2005, 2007, 2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any @@ -34,10 +34,9 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif +#endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include #endif /* HAVE_STRING_H */ #ifdef HAVE_UNISTD_H # include diff --git a/auth/aix_auth.c b/auth/aix_auth.c index 61c5adb1d..7a776be0f 100644 --- a/auth/aix_auth.c +++ b/auth/aix_auth.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2005, 2007-2009 Todd C. Miller + * Copyright (c) 1999-2005, 2007-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -33,10 +33,9 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif +#endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include #endif /* HAVE_STRING_H */ #ifdef HAVE_UNISTD_H # include diff --git a/auth/bsdauth.c b/auth/bsdauth.c index f70e90b00..2539713ac 100644 --- a/auth/bsdauth.c +++ b/auth/bsdauth.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 2000-2005, 2007-2008 Todd C. Miller + * Copyright (c) 2000-2005, 2007-2008, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -33,10 +34,9 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif +#endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include #endif /* HAVE_STRING_H */ #ifdef HAVE_UNISTD_H # include diff --git a/auth/dce.c b/auth/dce.c index 943e064c8..76b43b3f8 100644 --- a/auth/dce.c +++ b/auth/dce.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1996, 1998-2005 Todd C. Miller + * Copyright (c) 1996, 1998-2005, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -47,10 +48,9 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif +#endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include #endif /* HAVE_STRING_H */ #ifdef HAVE_UNISTD_H # include diff --git a/auth/fwtk.c b/auth/fwtk.c index 853fc3ba3..fba99e809 100644 --- a/auth/fwtk.c +++ b/auth/fwtk.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1999-2005, 2008 Todd C. Miller + * Copyright (c) 1999-2005, 2008, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -33,10 +34,9 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif +#endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include #endif /* HAVE_STRING_H */ #ifdef HAVE_UNISTD_H # include diff --git a/auth/kerb4.c b/auth/kerb4.c index 4b3e38147..f3107a063 100644 --- a/auth/kerb4.c +++ b/auth/kerb4.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1999-2005, 2007 Todd C. Miller + * Copyright (c) 1999-2005, 2007, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -33,10 +34,9 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif +#endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include #endif /* HAVE_STRING_H */ #ifdef HAVE_UNISTD_H # include diff --git a/auth/kerb5.c b/auth/kerb5.c index d03bd9a79..230898f7f 100644 --- a/auth/kerb5.c +++ b/auth/kerb5.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1999-2005, 2007-2008 Todd C. Miller + * Copyright (c) 1999-2005, 2007-2008, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -36,10 +37,9 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif +#endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include #endif /* HAVE_STRING_H */ #ifdef HAVE_UNISTD_H # include diff --git a/auth/pam.c b/auth/pam.c index 57add9ff2..257b64d86 100644 --- a/auth/pam.c +++ b/auth/pam.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2005, 2007-2009 Todd C. Miller + * Copyright (c) 1999-2005, 2007-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -32,15 +32,11 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/auth/passwd.c b/auth/passwd.c index e35130664..4f9efb8a2 100644 --- a/auth/passwd.c +++ b/auth/passwd.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1999-2005 Todd C. Miller + * Copyright (c) 1999-2005, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -33,11 +34,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/auth/rfc1938.c b/auth/rfc1938.c index 1769e6f7f..3bc39c302 100644 --- a/auth/rfc1938.c +++ b/auth/rfc1938.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994-1996, 1998-2005 + * Copyright (c) 1994-1996, 1998-2005, 2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any @@ -34,11 +34,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/auth/secureware.c b/auth/secureware.c index d21712706..e7148d3f7 100644 --- a/auth/secureware.c +++ b/auth/secureware.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2005 Todd C. Miller + * Copyright (c) 1998-2005, 2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -33,11 +33,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/auth/securid.c b/auth/securid.c index 4edddb4e5..6aec1098f 100644 --- a/auth/securid.c +++ b/auth/securid.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1999-2005, 2007 Todd C. Miller + * Copyright (c) 1999-2005, 2007, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -36,11 +37,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/auth/securid5.c b/auth/securid5.c index b59bf8f5d..ef9e2283f 100644 --- a/auth/securid5.c +++ b/auth/securid5.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1999-2005, 2007 Todd C. Miller + * Copyright (c) 1999-2005, 2007, 2010 + * Todd C. Miller * Copyright (c) 2002 Michael Stroucken * * Permission to use, copy, modify, and distribute this software for any @@ -37,11 +38,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/auth/sia.c b/auth/sia.c index 1f919f481..188676a7a 100644 --- a/auth/sia.c +++ b/auth/sia.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1999-2005, 2007 Todd C. Miller + * Copyright (c) 1999-2005, 2007, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -35,11 +36,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/auth/sudo_auth.c b/auth/sudo_auth.c index 58a079bb0..f17ae8d0f 100644 --- a/auth/sudo_auth.c +++ b/auth/sudo_auth.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2005, 2008-2009 Todd C. Miller + * Copyright (c) 1999-2005, 2008-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -32,15 +32,11 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/boottime.c b/boottime.c index 6af20aca9..a4dba43d8 100644 --- a/boottime.c +++ b/boottime.c @@ -29,12 +29,14 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# include -#else -# ifdef HAVE_STRINGS_H -# include +# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) +# include # endif +# include #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #include #ifdef HAVE_SYSCTL diff --git a/check.c b/check.c index 11119e5ff..8b7834a03 100644 --- a/check.c +++ b/check.c @@ -45,11 +45,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/defaults.c b/defaults.c index 67d638e39..670b1a6cd 100644 --- a/defaults.c +++ b/defaults.c @@ -34,11 +34,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ # ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ diff --git a/env.c b/env.c index 59b59eb34..366df078c 100644 --- a/env.c +++ b/env.c @@ -35,11 +35,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/exec.c b/exec.c index 2171e705f..4eee43fff 100644 --- a/exec.c +++ b/exec.c @@ -41,15 +41,11 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/exec_pty.c b/exec_pty.c index 27f06c046..3ded40a70 100644 --- a/exec_pty.c +++ b/exec_pty.c @@ -44,11 +44,10 @@ # include # endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/fileops.c b/fileops.c index c7e0bc77f..ca4903fe0 100644 --- a/fileops.c +++ b/fileops.c @@ -30,11 +30,10 @@ #include #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #include #include #ifdef HAVE_UNISTD_H diff --git a/find_path.c b/find_path.c index 2f2333963..78c96eaa7 100644 --- a/find_path.c +++ b/find_path.c @@ -35,11 +35,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/fnmatch.c b/fnmatch.c index 625d759cb..2255e5214 100644 --- a/fnmatch.c +++ b/fnmatch.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008 Todd C. Miller + * Copyright (c) 2008, 2010 Todd C. Miller * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. * @@ -42,11 +42,10 @@ #include #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #include #include "emul/fnmatch.h" diff --git a/get_pty.c b/get_pty.c index 19eedd937..7bc035518 100644 --- a/get_pty.c +++ b/get_pty.c @@ -34,11 +34,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/getcwd.c b/getcwd.c index daa6b4da3..109794ae8 100644 --- a/getcwd.c +++ b/getcwd.c @@ -44,11 +44,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #if defined(HAVE_MALLOC_H) && !defined(STDC_HEADERS) # include #endif /* HAVE_MALLOC_H && !STDC_HEADERS */ diff --git a/getdate.c b/getdate.c index 7deb31a07..928246b88 100644 --- a/getdate.c +++ b/getdate.c @@ -41,11 +41,10 @@ # include # endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #if TIME_WITH_SYS_TIME # include #endif @@ -114,7 +113,7 @@ static int yyerror __P((char *s)); static int yylex __P((void)); static int yyparse __P((void)); -#line 108 "getdate.y" +#line 107 "getdate.y" #ifndef YYSTYPE_DEFINED #define YYSTYPE_DEFINED typedef union { @@ -122,7 +121,7 @@ typedef union { enum _MERIDIAN Meridian; } YYSTYPE; #endif /* YYSTYPE_DEFINED */ -#line 126 "y.tab.c" +#line 125 "y.tab.c" #define tAGO 257 #define tDAY 258 #define tDAYZONE 259 @@ -390,7 +389,7 @@ short *yyss; short *yysslim; YYSTYPE *yyvs; int yystacksize; -#line 327 "getdate.y" +#line 326 "getdate.y" /* Month and day table. */ static TABLE const MonthDayTable[] = { @@ -1028,7 +1027,7 @@ main(ac, av) /* NOTREACHED */ } #endif /* defined(TEST) */ -#line 980 "y.tab.c" +#line 979 "y.tab.c" /* allocate initial stack or double stack size, up to YYMAXDEPTH */ #if defined(__cplusplus) || defined(__STDC__) static int yygrowstack(void) @@ -1234,37 +1233,37 @@ yyreduce: switch (yyn) { case 3: -#line 126 "getdate.y" +#line 125 "getdate.y" { yyHaveTime++; } break; case 4: -#line 129 "getdate.y" +#line 128 "getdate.y" { yyHaveZone++; } break; case 5: -#line 132 "getdate.y" +#line 131 "getdate.y" { yyHaveDate++; } break; case 6: -#line 135 "getdate.y" +#line 134 "getdate.y" { yyHaveDay++; } break; case 7: -#line 138 "getdate.y" +#line 137 "getdate.y" { yyHaveRel++; } break; case 9: -#line 144 "getdate.y" +#line 143 "getdate.y" { yyHour = yyvsp[-1].Number; yyMinutes = 0; @@ -1273,7 +1272,7 @@ case 9: } break; case 10: -#line 150 "getdate.y" +#line 149 "getdate.y" { yyHour = yyvsp[-3].Number; yyMinutes = yyvsp[-1].Number; @@ -1282,7 +1281,7 @@ case 10: } break; case 11: -#line 156 "getdate.y" +#line 155 "getdate.y" { yyHour = yyvsp[-3].Number; yyMinutes = yyvsp[-1].Number; @@ -1292,7 +1291,7 @@ case 11: } break; case 12: -#line 163 "getdate.y" +#line 162 "getdate.y" { yyHour = yyvsp[-5].Number; yyMinutes = yyvsp[-3].Number; @@ -1301,7 +1300,7 @@ case 12: } break; case 13: -#line 169 "getdate.y" +#line 168 "getdate.y" { yyHour = yyvsp[-5].Number; yyMinutes = yyvsp[-3].Number; @@ -1312,56 +1311,56 @@ case 13: } break; case 14: -#line 179 "getdate.y" +#line 178 "getdate.y" { yyTimezone = yyvsp[0].Number; yyDSTmode = DSToff; } break; case 15: -#line 183 "getdate.y" +#line 182 "getdate.y" { yyTimezone = yyvsp[0].Number; yyDSTmode = DSTon; } break; case 16: -#line 188 "getdate.y" +#line 187 "getdate.y" { yyTimezone = yyvsp[-1].Number; yyDSTmode = DSTon; } break; case 17: -#line 194 "getdate.y" +#line 193 "getdate.y" { yyDayOrdinal = 1; yyDayNumber = yyvsp[0].Number; } break; case 18: -#line 198 "getdate.y" +#line 197 "getdate.y" { yyDayOrdinal = 1; yyDayNumber = yyvsp[-1].Number; } break; case 19: -#line 202 "getdate.y" +#line 201 "getdate.y" { yyDayOrdinal = yyvsp[-1].Number; yyDayNumber = yyvsp[0].Number; } break; case 20: -#line 208 "getdate.y" +#line 207 "getdate.y" { yyMonth = yyvsp[-2].Number; yyDay = yyvsp[0].Number; } break; case 21: -#line 212 "getdate.y" +#line 211 "getdate.y" { if (yyvsp[-4].Number >= 100) { yyYear = yyvsp[-4].Number; @@ -1375,7 +1374,7 @@ case 21: } break; case 22: -#line 223 "getdate.y" +#line 222 "getdate.y" { /* ISO 8601 format. yyyy-mm-dd. */ yyYear = yyvsp[-2].Number; @@ -1384,7 +1383,7 @@ case 22: } break; case 23: -#line 229 "getdate.y" +#line 228 "getdate.y" { /* e.g. 17-JUN-1992. */ yyDay = yyvsp[-2].Number; @@ -1393,14 +1392,14 @@ case 23: } break; case 24: -#line 235 "getdate.y" +#line 234 "getdate.y" { yyMonth = yyvsp[-1].Number; yyDay = yyvsp[0].Number; } break; case 25: -#line 239 "getdate.y" +#line 238 "getdate.y" { yyMonth = yyvsp[-3].Number; yyDay = yyvsp[-2].Number; @@ -1408,14 +1407,14 @@ case 25: } break; case 26: -#line 244 "getdate.y" +#line 243 "getdate.y" { yyMonth = yyvsp[0].Number; yyDay = yyvsp[-1].Number; } break; case 27: -#line 248 "getdate.y" +#line 247 "getdate.y" { yyMonth = yyvsp[-1].Number; yyDay = yyvsp[-2].Number; @@ -1423,68 +1422,68 @@ case 27: } break; case 28: -#line 255 "getdate.y" +#line 254 "getdate.y" { yyRelSeconds = -yyRelSeconds; yyRelMonth = -yyRelMonth; } break; case 30: -#line 262 "getdate.y" +#line 261 "getdate.y" { yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L; } break; case 31: -#line 265 "getdate.y" +#line 264 "getdate.y" { yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L; } break; case 32: -#line 268 "getdate.y" +#line 267 "getdate.y" { yyRelSeconds += yyvsp[0].Number * 60L; } break; case 33: -#line 271 "getdate.y" +#line 270 "getdate.y" { yyRelSeconds += yyvsp[-1].Number; } break; case 34: -#line 274 "getdate.y" +#line 273 "getdate.y" { yyRelSeconds += yyvsp[-1].Number; } break; case 35: -#line 277 "getdate.y" +#line 276 "getdate.y" { yyRelSeconds++; } break; case 36: -#line 280 "getdate.y" +#line 279 "getdate.y" { yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; } break; case 37: -#line 283 "getdate.y" +#line 282 "getdate.y" { yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; } break; case 38: -#line 286 "getdate.y" +#line 285 "getdate.y" { yyRelMonth += yyvsp[0].Number; } break; case 39: -#line 291 "getdate.y" +#line 290 "getdate.y" { if (yyHaveTime && yyHaveDate && !yyHaveRel) yyYear = yyvsp[0].Number; @@ -1512,18 +1511,18 @@ case 39: } break; case 40: -#line 318 "getdate.y" +#line 317 "getdate.y" { yyval.Meridian = MER24; } break; case 41: -#line 321 "getdate.y" +#line 320 "getdate.y" { yyval.Meridian = yyvsp[0].Meridian; } break; -#line 1475 "y.tab.c" +#line 1474 "y.tab.c" } yyssp -= yym; yystate = *yyssp; diff --git a/getdate.y b/getdate.y index c3d8a9e4e..2b2e3c9b3 100644 --- a/getdate.y +++ b/getdate.y @@ -30,11 +30,10 @@ # include # endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #if TIME_WITH_SYS_TIME # include #endif diff --git a/getline.c b/getline.c index 705dd5f67..b7db37973 100644 --- a/getline.c +++ b/getline.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Todd C. Miller + * Copyright (c) 2009-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -29,11 +29,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #include #include "compat.h" diff --git a/getspwuid.c b/getspwuid.c index 8c07d1516..7ee5ebaf8 100644 --- a/getspwuid.c +++ b/getspwuid.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1996, 1998-2005 Todd C. Miller + * Copyright (c) 1996, 1998-2005, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -33,15 +34,11 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/glob.c b/glob.c index 5df33b596..967362653 100644 --- a/glob.c +++ b/glob.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2009 Todd C. Miller + * Copyright (c) 2008-2010 Todd C. Miller * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * @@ -69,11 +69,10 @@ #endif /* HAVE_MALLOC_H && !STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/goodpath.c b/goodpath.c index 258bc899a..197131427 100644 --- a/goodpath.c +++ b/goodpath.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1996, 1998-2005 Todd C. Miller + * Copyright (c) 1996, 1998-2005, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -26,11 +27,10 @@ #include #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/gram.c b/gram.c index f4fca2ea8..d2e8b46ae 100644 --- a/gram.c +++ b/gram.c @@ -11,7 +11,7 @@ #define YYPREFIX "yy" #line 2 "gram.y" /* - * Copyright (c) 1996, 1998-2005, 2007-2009 + * Copyright (c) 1996, 1998-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any @@ -48,11 +48,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ @@ -119,7 +118,7 @@ yyerror(s) } parse_error = TRUE; } -#line 113 "gram.y" +#line 112 "gram.y" #ifndef YYSTYPE_DEFINED #define YYSTYPE_DEFINED typedef union { @@ -135,7 +134,7 @@ typedef union { int tok; } YYSTYPE; #endif /* YYSTYPE_DEFINED */ -#line 139 "y.tab.c" +#line 138 "y.tab.c" #define COMMAND 257 #define ALIAS 258 #define DEFVAR 259 @@ -633,7 +632,7 @@ short *yyss; short *yysslim; YYSTYPE *yyvs; int yystacksize; -#line 607 "gram.y" +#line 606 "gram.y" static struct defaults * new_default(var, val, op) char *var; @@ -824,7 +823,7 @@ init_parser(path, quiet) sudolineno = 1; verbose = !quiet; } -#line 776 "y.tab.c" +#line 775 "y.tab.c" /* allocate initial stack or double stack size, up to YYMAXDEPTH */ #if defined(__cplusplus) || defined(__STDC__) static int yygrowstack(void) @@ -1030,127 +1029,127 @@ yyreduce: switch (yyn) { case 1: -#line 188 "gram.y" +#line 187 "gram.y" { ; } break; case 5: -#line 196 "gram.y" +#line 195 "gram.y" { ; } break; case 6: -#line 199 "gram.y" +#line 198 "gram.y" { yyerrok; } break; case 7: -#line 202 "gram.y" +#line 201 "gram.y" { add_userspec(yyvsp[-1].member, yyvsp[0].privilege); } break; case 8: -#line 205 "gram.y" +#line 204 "gram.y" { ; } break; case 9: -#line 208 "gram.y" +#line 207 "gram.y" { ; } break; case 10: -#line 211 "gram.y" +#line 210 "gram.y" { ; } break; case 11: -#line 214 "gram.y" +#line 213 "gram.y" { ; } break; case 12: -#line 217 "gram.y" +#line 216 "gram.y" { add_defaults(DEFAULTS, NULL, yyvsp[0].defaults); } break; case 13: -#line 220 "gram.y" +#line 219 "gram.y" { add_defaults(DEFAULTS_USER, yyvsp[-1].member, yyvsp[0].defaults); } break; case 14: -#line 223 "gram.y" +#line 222 "gram.y" { add_defaults(DEFAULTS_RUNAS, yyvsp[-1].member, yyvsp[0].defaults); } break; case 15: -#line 226 "gram.y" +#line 225 "gram.y" { add_defaults(DEFAULTS_HOST, yyvsp[-1].member, yyvsp[0].defaults); } break; case 16: -#line 229 "gram.y" +#line 228 "gram.y" { add_defaults(DEFAULTS_CMND, yyvsp[-1].member, yyvsp[0].defaults); } break; case 18: -#line 235 "gram.y" +#line 234 "gram.y" { list_append(yyvsp[-2].defaults, yyvsp[0].defaults); yyval.defaults = yyvsp[-2].defaults; } break; case 19: -#line 241 "gram.y" +#line 240 "gram.y" { yyval.defaults = new_default(yyvsp[0].string, NULL, TRUE); } break; case 20: -#line 244 "gram.y" +#line 243 "gram.y" { yyval.defaults = new_default(yyvsp[0].string, NULL, FALSE); } break; case 21: -#line 247 "gram.y" +#line 246 "gram.y" { yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, TRUE); } break; case 22: -#line 250 "gram.y" +#line 249 "gram.y" { yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '+'); } break; case 23: -#line 253 "gram.y" +#line 252 "gram.y" { yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '-'); } break; case 25: -#line 259 "gram.y" +#line 258 "gram.y" { list_append(yyvsp[-2].privilege, yyvsp[0].privilege); yyval.privilege = yyvsp[-2].privilege; } break; case 26: -#line 265 "gram.y" +#line 264 "gram.y" { struct privilege *p = emalloc(sizeof(*p)); list2tq(&p->hostlist, yyvsp[-2].member); @@ -1161,51 +1160,51 @@ case 26: } break; case 27: -#line 275 "gram.y" +#line 274 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = FALSE; } break; case 28: -#line 279 "gram.y" +#line 278 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = TRUE; } break; case 29: -#line 285 "gram.y" +#line 284 "gram.y" { yyval.member = new_member(yyvsp[0].string, ALIAS); } break; case 30: -#line 288 "gram.y" +#line 287 "gram.y" { yyval.member = new_member(NULL, ALL); } break; case 31: -#line 291 "gram.y" +#line 290 "gram.y" { yyval.member = new_member(yyvsp[0].string, NETGROUP); } break; case 32: -#line 294 "gram.y" +#line 293 "gram.y" { yyval.member = new_member(yyvsp[0].string, NTWKADDR); } break; case 33: -#line 297 "gram.y" +#line 296 "gram.y" { yyval.member = new_member(yyvsp[0].string, WORD); } break; case 35: -#line 303 "gram.y" +#line 302 "gram.y" { list_append(yyvsp[-2].cmndspec, yyvsp[0].cmndspec); #ifdef HAVE_SELINUX @@ -1238,7 +1237,7 @@ case 35: } break; case 36: -#line 335 "gram.y" +#line 334 "gram.y" { struct cmndspec *cs = emalloc(sizeof(*cs)); if (yyvsp[-3].runas != NULL) { @@ -1265,80 +1264,80 @@ case 36: } break; case 37: -#line 361 "gram.y" +#line 360 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = FALSE; } break; case 38: -#line 365 "gram.y" +#line 364 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = TRUE; } break; case 39: -#line 371 "gram.y" +#line 370 "gram.y" { yyval.string = yyvsp[0].string; } break; case 40: -#line 376 "gram.y" +#line 375 "gram.y" { yyval.string = yyvsp[0].string; } break; case 41: -#line 381 "gram.y" +#line 380 "gram.y" { yyval.seinfo.role = NULL; yyval.seinfo.type = NULL; } break; case 42: -#line 385 "gram.y" +#line 384 "gram.y" { yyval.seinfo.role = yyvsp[0].string; yyval.seinfo.type = NULL; } break; case 43: -#line 389 "gram.y" +#line 388 "gram.y" { yyval.seinfo.type = yyvsp[0].string; yyval.seinfo.role = NULL; } break; case 44: -#line 393 "gram.y" +#line 392 "gram.y" { yyval.seinfo.role = yyvsp[-1].string; yyval.seinfo.type = yyvsp[0].string; } break; case 45: -#line 397 "gram.y" +#line 396 "gram.y" { yyval.seinfo.type = yyvsp[-1].string; yyval.seinfo.role = yyvsp[0].string; } break; case 46: -#line 403 "gram.y" +#line 402 "gram.y" { yyval.runas = NULL; } break; case 47: -#line 406 "gram.y" +#line 405 "gram.y" { yyval.runas = yyvsp[-1].runas; } break; case 48: -#line 411 "gram.y" +#line 410 "gram.y" { yyval.runas = emalloc(sizeof(struct runascontainer)); yyval.runas->runasusers = yyvsp[0].member; @@ -1346,7 +1345,7 @@ case 48: } break; case 49: -#line 416 "gram.y" +#line 415 "gram.y" { yyval.runas = emalloc(sizeof(struct runascontainer)); yyval.runas->runasusers = yyvsp[-2].member; @@ -1354,7 +1353,7 @@ case 49: } break; case 50: -#line 421 "gram.y" +#line 420 "gram.y" { yyval.runas = emalloc(sizeof(struct runascontainer)); yyval.runas->runasusers = NULL; @@ -1362,86 +1361,86 @@ case 50: } break; case 51: -#line 428 "gram.y" +#line 427 "gram.y" { yyval.tag.nopasswd = yyval.tag.noexec = yyval.tag.setenv = yyval.tag.log_input = yyval.tag.log_output = UNSPEC; } break; case 52: -#line 432 "gram.y" +#line 431 "gram.y" { yyval.tag.nopasswd = TRUE; } break; case 53: -#line 435 "gram.y" +#line 434 "gram.y" { yyval.tag.nopasswd = FALSE; } break; case 54: -#line 438 "gram.y" +#line 437 "gram.y" { yyval.tag.noexec = TRUE; } break; case 55: -#line 441 "gram.y" +#line 440 "gram.y" { yyval.tag.noexec = FALSE; } break; case 56: -#line 444 "gram.y" +#line 443 "gram.y" { yyval.tag.setenv = TRUE; } break; case 57: -#line 447 "gram.y" +#line 446 "gram.y" { yyval.tag.setenv = FALSE; } break; case 58: -#line 450 "gram.y" +#line 449 "gram.y" { yyval.tag.log_input = TRUE; } break; case 59: -#line 453 "gram.y" +#line 452 "gram.y" { yyval.tag.log_input = FALSE; } break; case 60: -#line 456 "gram.y" +#line 455 "gram.y" { yyval.tag.log_output = TRUE; } break; case 61: -#line 459 "gram.y" +#line 458 "gram.y" { yyval.tag.log_output = FALSE; } break; case 62: -#line 464 "gram.y" +#line 463 "gram.y" { yyval.member = new_member(NULL, ALL); } break; case 63: -#line 467 "gram.y" +#line 466 "gram.y" { yyval.member = new_member(yyvsp[0].string, ALIAS); } break; case 64: -#line 470 "gram.y" +#line 469 "gram.y" { struct sudo_command *c = emalloc(sizeof(*c)); c->cmnd = yyvsp[0].command.cmnd; @@ -1450,7 +1449,7 @@ case 64: } break; case 67: -#line 482 "gram.y" +#line 481 "gram.y" { char *s; if ((s = alias_add(yyvsp[-2].string, HOSTALIAS, yyvsp[0].member)) != NULL) { @@ -1460,14 +1459,14 @@ case 67: } break; case 69: -#line 492 "gram.y" +#line 491 "gram.y" { list_append(yyvsp[-2].member, yyvsp[0].member); yyval.member = yyvsp[-2].member; } break; case 72: -#line 502 "gram.y" +#line 501 "gram.y" { char *s; if ((s = alias_add(yyvsp[-2].string, CMNDALIAS, yyvsp[0].member)) != NULL) { @@ -1477,14 +1476,14 @@ case 72: } break; case 74: -#line 512 "gram.y" +#line 511 "gram.y" { list_append(yyvsp[-2].member, yyvsp[0].member); yyval.member = yyvsp[-2].member; } break; case 77: -#line 522 "gram.y" +#line 521 "gram.y" { char *s; if ((s = alias_add(yyvsp[-2].string, RUNASALIAS, yyvsp[0].member)) != NULL) { @@ -1494,7 +1493,7 @@ case 77: } break; case 80: -#line 535 "gram.y" +#line 534 "gram.y" { char *s; if ((s = alias_add(yyvsp[-2].string, USERALIAS, yyvsp[0].member)) != NULL) { @@ -1504,96 +1503,96 @@ case 80: } break; case 82: -#line 545 "gram.y" +#line 544 "gram.y" { list_append(yyvsp[-2].member, yyvsp[0].member); yyval.member = yyvsp[-2].member; } break; case 83: -#line 551 "gram.y" +#line 550 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = FALSE; } break; case 84: -#line 555 "gram.y" +#line 554 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = TRUE; } break; case 85: -#line 561 "gram.y" +#line 560 "gram.y" { yyval.member = new_member(yyvsp[0].string, ALIAS); } break; case 86: -#line 564 "gram.y" +#line 563 "gram.y" { yyval.member = new_member(NULL, ALL); } break; case 87: -#line 567 "gram.y" +#line 566 "gram.y" { yyval.member = new_member(yyvsp[0].string, NETGROUP); } break; case 88: -#line 570 "gram.y" +#line 569 "gram.y" { yyval.member = new_member(yyvsp[0].string, USERGROUP); } break; case 89: -#line 573 "gram.y" +#line 572 "gram.y" { yyval.member = new_member(yyvsp[0].string, WORD); } break; case 91: -#line 579 "gram.y" +#line 578 "gram.y" { list_append(yyvsp[-2].member, yyvsp[0].member); yyval.member = yyvsp[-2].member; } break; case 92: -#line 585 "gram.y" +#line 584 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = FALSE; } break; case 93: -#line 589 "gram.y" +#line 588 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = TRUE; } break; case 94: -#line 595 "gram.y" +#line 594 "gram.y" { yyval.member = new_member(yyvsp[0].string, ALIAS); } break; case 95: -#line 598 "gram.y" +#line 597 "gram.y" { yyval.member = new_member(NULL, ALL); } break; case 96: -#line 601 "gram.y" +#line 600 "gram.y" { yyval.member = new_member(yyvsp[0].string, WORD); } break; -#line 1545 "y.tab.c" +#line 1544 "y.tab.c" } yyssp -= yym; yystate = *yyssp; diff --git a/gram.y b/gram.y index 6a48f2ddc..f319eea4f 100644 --- a/gram.y +++ b/gram.y @@ -37,11 +37,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/interfaces.c b/interfaces.c index eed075301..502cb94ae 100644 --- a/interfaces.c +++ b/interfaces.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998-2005, 2007-2009 + * Copyright (c) 1996, 1998-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any @@ -52,11 +52,10 @@ struct rtentry; # include # endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/iolog.c b/iolog.c index 666ebbc1a..4e492b601 100644 --- a/iolog.c +++ b/iolog.c @@ -31,11 +31,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/lbuf.c b/lbuf.c index fb2901c64..e64f76bdd 100644 --- a/lbuf.c +++ b/lbuf.c @@ -32,11 +32,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/ldap.c b/ldap.c index 7d35ca6e6..6bde360a3 100644 --- a/ldap.c +++ b/ldap.c @@ -33,11 +33,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #if defined(HAVE_MALLOC_H) && !defined(STDC_HEADERS) # include #endif /* HAVE_MALLOC_H && !STDC_HEADERS */ diff --git a/logging.c b/logging.c index a3f5231f3..1d4acc5c6 100644 --- a/logging.c +++ b/logging.c @@ -40,11 +40,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/match.c b/match.c index 369130ce8..64d413b3d 100644 --- a/match.c +++ b/match.c @@ -38,11 +38,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/parse.c b/parse.c index 48a25d89b..245219e46 100644 --- a/parse.c +++ b/parse.c @@ -31,11 +31,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/parse_args.c b/parse_args.c index 8815b9750..3611b443d 100644 --- a/parse_args.c +++ b/parse_args.c @@ -33,15 +33,11 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/pwutil.c b/pwutil.c index dc55e2dca..3bdc88a88 100644 --- a/pwutil.c +++ b/pwutil.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998-2005, 2007-2009 + * Copyright (c) 1996, 1998-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any @@ -38,11 +38,10 @@ # include # endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/set_perms.c b/set_perms.c index 41dd9a44e..4b3896ea7 100644 --- a/set_perms.c +++ b/set_perms.c @@ -34,11 +34,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/snprintf.c b/snprintf.c index 7ad477469..27757f95f 100644 --- a/snprintf.c +++ b/snprintf.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1999-2005, 2008 Todd C. Miller + * Copyright (c) 1999-2005, 2008, 2010 + * Todd C. Miller * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * @@ -60,11 +61,10 @@ # include # endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #if defined(HAVE_MALLOC_H) && !defined(STDC_HEADERS) # include #endif /* HAVE_MALLOC_H && !STDC_HEADERS */ diff --git a/sudo.c b/sudo.c index 978ad5c2c..b219ea484 100644 --- a/sudo.c +++ b/sudo.c @@ -52,11 +52,10 @@ # include # endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/sudo_edit.c b/sudo_edit.c index 59dbd9db9..e5e14d496 100644 --- a/sudo_edit.c +++ b/sudo_edit.c @@ -35,11 +35,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/sudo_nss.c b/sudo_nss.c index ae8b9623f..e21aaae49 100644 --- a/sudo_nss.c +++ b/sudo_nss.c @@ -29,11 +29,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/sudoreplay.c b/sudoreplay.c index 75dbc8e40..6e9ed7ef6 100644 --- a/sudoreplay.c +++ b/sudoreplay.c @@ -39,11 +39,10 @@ # include # endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/term.c b/term.c index 895ef37e4..a3cad6196 100644 --- a/term.c +++ b/term.c @@ -32,11 +32,10 @@ # include # endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_TERMIOS_H # include #else diff --git a/testsudoers.c b/testsudoers.c index a551be55f..1bf2cd301 100644 --- a/testsudoers.c +++ b/testsudoers.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998-2005, 2007-2009 + * Copyright (c) 1996, 1998-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any @@ -40,11 +40,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/tgetpass.c b/tgetpass.c index b8aa25dd9..8127eab1e 100644 --- a/tgetpass.c +++ b/tgetpass.c @@ -41,11 +41,10 @@ # include # endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/toke.c b/toke.c index 0d99df888..75682b9dd 100644 --- a/toke.c +++ b/toke.c @@ -1353,7 +1353,7 @@ char *yytext; #define INITIAL 0 #line 2 "toke.l" /* - * Copyright (c) 1996, 1998-2005, 2007-2009 + * Copyright (c) 1996, 1998-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any @@ -1392,11 +1392,10 @@ char *yytext; #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ @@ -1466,7 +1465,7 @@ extern void yyerror __P((const char *)); #define INSTR 5 -#line 1470 "lex.yy.c" +#line 1469 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1620,9 +1619,9 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 128 "toke.l" +#line 127 "toke.l" -#line 1626 "lex.yy.c" +#line 1625 "lex.yy.c" if ( yy_init ) { @@ -1708,12 +1707,12 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 129 "toke.l" +#line 128 "toke.l" BEGIN STARTDEFS; YY_BREAK case 2: YY_RULE_SETUP -#line 131 "toke.l" +#line 130 "toke.l" { BEGIN INDEFS; LEXTRACE("DEFVAR "); @@ -1725,7 +1724,7 @@ YY_RULE_SETUP case 3: YY_RULE_SETUP -#line 140 "toke.l" +#line 139 "toke.l" { BEGIN STARTDEFS; LEXTRACE(", "); @@ -1734,7 +1733,7 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 146 "toke.l" +#line 145 "toke.l" { LEXTRACE("= "); return('='); @@ -1742,7 +1741,7 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 151 "toke.l" +#line 150 "toke.l" { LEXTRACE("+= "); return('+'); @@ -1750,7 +1749,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 156 "toke.l" +#line 155 "toke.l" { LEXTRACE("-= "); return('-'); @@ -1758,7 +1757,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 161 "toke.l" +#line 160 "toke.l" { LEXTRACE("BEGINSTR "); yylval.string = NULL; @@ -1767,7 +1766,7 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 167 "toke.l" +#line 166 "toke.l" { LEXTRACE("WORD(2) "); if (!fill(yytext, yyleng)) @@ -1779,7 +1778,7 @@ YY_RULE_SETUP case 9: YY_RULE_SETUP -#line 176 "toke.l" +#line 175 "toke.l" { /* Line continuation char followed by newline. */ ++sudolineno; @@ -1788,7 +1787,7 @@ YY_RULE_SETUP YY_BREAK case 10: YY_RULE_SETUP -#line 182 "toke.l" +#line 181 "toke.l" { LEXTRACE("ENDSTR "); BEGIN INDEFS; @@ -1797,7 +1796,7 @@ YY_RULE_SETUP YY_BREAK case 11: YY_RULE_SETUP -#line 188 "toke.l" +#line 187 "toke.l" { LEXTRACE("BACKSLASH "); if (!append(yytext, yyleng)) @@ -1806,7 +1805,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 194 "toke.l" +#line 193 "toke.l" { LEXTRACE("STRBODY "); if (!append(yytext, yyleng)) @@ -1817,7 +1816,7 @@ YY_RULE_SETUP case 13: YY_RULE_SETUP -#line 202 "toke.l" +#line 201 "toke.l" { /* quoted fnmatch glob char, pass verbatim */ LEXTRACE("QUOTEDCHAR "); @@ -1828,7 +1827,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 210 "toke.l" +#line 209 "toke.l" { /* quoted sudoers special char, strip backslash */ LEXTRACE("QUOTEDCHAR "); @@ -1839,7 +1838,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 218 "toke.l" +#line 217 "toke.l" { BEGIN INITIAL; yyless(0); @@ -1848,7 +1847,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 224 "toke.l" +#line 223 "toke.l" { LEXTRACE("ARG "); if (!fill_args(yytext, yyleng, sawspace)) @@ -1859,7 +1858,7 @@ YY_RULE_SETUP case 17: YY_RULE_SETUP -#line 232 "toke.l" +#line 231 "toke.l" { char *path; @@ -1875,7 +1874,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 245 "toke.l" +#line 244 "toke.l" { char *path; @@ -1894,7 +1893,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 261 "toke.l" +#line 260 "toke.l" { int n; for (n = 0; isblank((unsigned char)yytext[n]); n++) @@ -1926,7 +1925,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 290 "toke.l" +#line 289 "toke.l" { int n; for (n = 0; isblank((unsigned char)yytext[n]); n++) @@ -1949,7 +1948,7 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 310 "toke.l" +#line 309 "toke.l" { /* cmnd does not require passwd for this user */ LEXTRACE("NOPASSWD "); @@ -1958,7 +1957,7 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 316 "toke.l" +#line 315 "toke.l" { /* cmnd requires passwd for this user */ LEXTRACE("PASSWD "); @@ -1967,7 +1966,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 322 "toke.l" +#line 321 "toke.l" { LEXTRACE("NOEXEC "); return(NOEXEC); @@ -1975,7 +1974,7 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 327 "toke.l" +#line 326 "toke.l" { LEXTRACE("EXEC "); return(EXEC); @@ -1983,7 +1982,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 332 "toke.l" +#line 331 "toke.l" { LEXTRACE("SETENV "); return(SETENV); @@ -1991,7 +1990,7 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 337 "toke.l" +#line 336 "toke.l" { LEXTRACE("NOSETENV "); return(NOSETENV); @@ -1999,7 +1998,7 @@ YY_RULE_SETUP YY_BREAK case 27: YY_RULE_SETUP -#line 342 "toke.l" +#line 341 "toke.l" { /* netgroup */ if (!fill(yytext, yyleng)) @@ -2010,7 +2009,7 @@ YY_RULE_SETUP YY_BREAK case 28: YY_RULE_SETUP -#line 350 "toke.l" +#line 349 "toke.l" { /* UN*X group */ if (!fill(yytext, yyleng)) @@ -2021,7 +2020,7 @@ YY_RULE_SETUP YY_BREAK case 29: YY_RULE_SETUP -#line 358 "toke.l" +#line 357 "toke.l" { if (!fill(yytext, yyleng)) yyterminate(); @@ -2031,7 +2030,7 @@ YY_RULE_SETUP YY_BREAK case 30: YY_RULE_SETUP -#line 365 "toke.l" +#line 364 "toke.l" { if (!fill(yytext, yyleng)) yyterminate(); @@ -2041,7 +2040,7 @@ YY_RULE_SETUP YY_BREAK case 31: YY_RULE_SETUP -#line 372 "toke.l" +#line 371 "toke.l" { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); @@ -2055,7 +2054,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 383 "toke.l" +#line 382 "toke.l" { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); @@ -2069,7 +2068,7 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 394 "toke.l" +#line 393 "toke.l" { if (strcmp(yytext, "ALL") == 0) { LEXTRACE("ALL "); @@ -2094,7 +2093,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 416 "toke.l" +#line 415 "toke.l" { /* no command args allowed for Defaults!/path */ if (!fill_cmnd(yytext, yyleng)) @@ -2105,7 +2104,7 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 424 "toke.l" +#line 423 "toke.l" { BEGIN GOTCMND; LEXTRACE("COMMAND "); @@ -2115,7 +2114,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 431 "toke.l" +#line 430 "toke.l" { /* directories can't have args... */ if (yytext[yyleng - 1] == '/') { @@ -2133,7 +2132,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 446 "toke.l" +#line 445 "toke.l" { /* a quoted user/group name */ if (!fill(yytext + 1, yyleng - 2)) @@ -2153,7 +2152,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 463 "toke.l" +#line 462 "toke.l" { /* a word */ if (!fill(yytext, yyleng)) @@ -2164,7 +2163,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 471 "toke.l" +#line 470 "toke.l" { LEXTRACE("( "); return ('('); @@ -2172,7 +2171,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 476 "toke.l" +#line 475 "toke.l" { LEXTRACE(") "); return(')'); @@ -2180,7 +2179,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 481 "toke.l" +#line 480 "toke.l" { LEXTRACE(", "); return(','); @@ -2188,7 +2187,7 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 486 "toke.l" +#line 485 "toke.l" { LEXTRACE("= "); return('='); @@ -2196,7 +2195,7 @@ YY_RULE_SETUP YY_BREAK case 43: YY_RULE_SETUP -#line 491 "toke.l" +#line 490 "toke.l" { LEXTRACE(": "); return(':'); @@ -2204,7 +2203,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 496 "toke.l" +#line 495 "toke.l" { if (yyleng % 2 == 1) return('!'); /* return '!' */ @@ -2212,7 +2211,7 @@ YY_RULE_SETUP YY_BREAK case 45: YY_RULE_SETUP -#line 501 "toke.l" +#line 500 "toke.l" { BEGIN INITIAL; ++sudolineno; @@ -2222,14 +2221,14 @@ YY_RULE_SETUP YY_BREAK case 46: YY_RULE_SETUP -#line 508 "toke.l" +#line 507 "toke.l" { /* throw away space/tabs */ sawspace = TRUE; /* but remember for fill_args */ } YY_BREAK case 47: YY_RULE_SETUP -#line 512 "toke.l" +#line 511 "toke.l" { sawspace = TRUE; /* remember for fill_args */ ++sudolineno; @@ -2238,7 +2237,7 @@ YY_RULE_SETUP YY_BREAK case 48: YY_RULE_SETUP -#line 518 "toke.l" +#line 517 "toke.l" { BEGIN INITIAL; ++sudolineno; @@ -2248,7 +2247,7 @@ YY_RULE_SETUP YY_BREAK case 49: YY_RULE_SETUP -#line 525 "toke.l" +#line 524 "toke.l" { LEXTRACE("ERROR "); return(ERROR); @@ -2260,7 +2259,7 @@ case YY_STATE_EOF(GOTCMND): case YY_STATE_EOF(STARTDEFS): case YY_STATE_EOF(INDEFS): case YY_STATE_EOF(INSTR): -#line 530 "toke.l" +#line 529 "toke.l" { if (YY_START != INITIAL) { BEGIN INITIAL; @@ -2273,10 +2272,10 @@ case YY_STATE_EOF(INSTR): YY_BREAK case 50: YY_RULE_SETUP -#line 540 "toke.l" +#line 539 "toke.l" ECHO; YY_BREAK -#line 2280 "lex.yy.c" +#line 2279 "lex.yy.c" case YY_END_OF_BUFFER: { @@ -3165,7 +3164,7 @@ int main() return 0; } #endif -#line 540 "toke.l" +#line 539 "toke.l" static unsigned char hexchar(s) diff --git a/toke.l b/toke.l index c871a1100..706453e1f 100644 --- a/toke.l +++ b/toke.l @@ -39,11 +39,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/tsgetgrpw.c b/tsgetgrpw.c index 3e8d46d09..6f14d3fb5 100644 --- a/tsgetgrpw.c +++ b/tsgetgrpw.c @@ -38,11 +38,10 @@ # include # endif # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #include #include #include diff --git a/visudo.c b/visudo.c index 606a054ca..eeb141eb7 100644 --- a/visudo.c +++ b/visudo.c @@ -51,11 +51,10 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -- 2.40.0