Re: Fix some mg(1) warnings
commited, thanks!
On Mon, May 29, 2017 at 03:15:21PM -0400, Brian Callahan wrote:
> Hi tech --
>
> This diff cleans up some warnings found with WARNINGS=yes and
> compiling with both cc and clang. I ignored the -Wsign-compare
> and -Wmissing-prototypes warnings.
>
> ~Brian
>
> Index: dir.c
> ===
> RCS file: /cvs/src/usr.bin/mg/dir.c,v
> retrieving revision 1.29
> diff -u -p -u -p -r1.29 dir.c
> --- dir.c 12 Sep 2016 18:32:54 - 1.29
> +++ dir.c 29 May 2017 19:08:39 -
> @@ -117,7 +117,7 @@ do_makedir(char *path)
> {
> struct stat sb;
> int finished, ishere;
> - mode_t dir_mode, mode, oumask;
> + mode_t dir_mode, f_mode, oumask;
> char*slash;
>
> if ((path = adjustname(path, TRUE)) == NULL)
> @@ -131,8 +131,8 @@ do_makedir(char *path)
> slash = path;
>
> oumask = umask(0);
> - mode = 0777 & ~oumask;
> - dir_mode = mode | S_IWUSR | S_IXUSR;
> + f_mode = 0777 & ~oumask;
> + dir_mode = f_mode | S_IWUSR | S_IXUSR;
>
> for (;;) {
> slash += strspn(slash, "/");
> @@ -152,8 +152,8 @@ do_makedir(char *path)
> continue;
> }
>
> - if (mkdir(path, finished ? mode : dir_mode) == 0) {
> - if (mode > 0777 && chmod(path, mode) < 0) {
> + if (mkdir(path, finished ? f_mode : dir_mode) == 0) {
> + if (f_mode > 0777 && chmod(path, f_mode) < 0) {
> umask(oumask);
> return (ABORT);
> }
> Index: fileio.c
> ===
> RCS file: /cvs/src/usr.bin/mg/fileio.c,v
> retrieving revision 1.103
> diff -u -p -u -p -r1.103 fileio.c
> --- fileio.c 28 Jul 2016 21:40:25 - 1.103
> +++ fileio.c 29 May 2017 19:08:39 -
> @@ -215,6 +215,7 @@ int
> fbackupfile(const char *fn)
> {
> struct stat sb;
> + struct timespec new_times[2];
> int from, to, serrno;
> ssize_t nread;
> char buf[BUFSIZ];
> @@ -268,7 +269,6 @@ fbackupfile(const char *fn)
> (void) fchmod(to, (sb.st_mode & 0777));
>
> /* copy the mtime to the backupfile */
> - struct timespec new_times[2];
> new_times[0] = sb.st_atim;
> new_times[1] = sb.st_mtim;
> futimens(to, new_times);
> Index: modes.c
> ===
> RCS file: /cvs/src/usr.bin/mg/modes.c,v
> retrieving revision 1.20
> diff -u -p -u -p -r1.20 modes.c
> --- modes.c 19 Mar 2015 21:22:15 - 1.20
> +++ modes.c 29 May 2017 19:08:39 -
> @@ -23,14 +23,14 @@ struct maps_s *defb_modes[PBMODES] = { &
> int defb_flag = 0;
>
> int
> -changemode(int f, int n, char *mode)
> +changemode(int f, int n, char *newmode)
> {
> int i;
> struct maps_s *m;
>
> - if ((m = name_mode(mode)) == NULL) {
> + if ((m = name_mode(newmode)) == NULL) {
> dobeep();
> - ewprintf("Can't find mode %s", mode);
> + ewprintf("Can't find mode %s", newmode);
> return (FALSE);
> }
> if (!(f & FFARG)) {
> Index: re_search.c
> ===
> RCS file: /cvs/src/usr.bin/mg/re_search.c,v
> retrieving revision 1.31
> diff -u -p -u -p -r1.31 re_search.c
> --- re_search.c 19 Mar 2015 21:22:15 - 1.31
> +++ re_search.c 29 May 2017 19:08:40 -
> @@ -420,17 +420,17 @@ re_backsrch(void)
> * some do-it-yourself control expansion.
> */
> static int
> -re_readpattern(char *prompt)
> +re_readpattern(char *re_prompt)
> {
> static int dofree = 0;
> int flags, error, s;
> chartpat[NPAT], *rep;
>
> if (re_pat[0] == '\0')
> - rep = eread("%s: ", tpat, NPAT, EFNEW | EFCR, prompt);
> + rep = eread("%s: ", tpat, NPAT, EFNEW | EFCR, re_prompt);
> else
> rep = eread("%s: (default %s) ", tpat, NPAT,
> - EFNUL | EFNEW | EFCR, prompt, re_pat);
> + EFNUL | EFNEW | EFCR, re_prompt, re_pat);
> if (rep == NULL)
> return (ABORT);
> if (rep[0] != '\0') {
> Index: search.c
> ===
> RCS file: /cvs/src/usr.bin/mg/search.c,v
> retrieving revision 1.44
> diff -u -p -u -p -r1.44 search.c
> --- search.c 19 Mar 2015 21:22:15 - 1.44
> +++ search.c 29 May 2017 19:08:40 -
> @@ -542,16 +542,16 @@ is_prompt(int dir, int flag, int success
> }
>
> /*
> - * Prompt writing routine for the incremental search. The "prompt" is just
> + * Prompt writing routine for the incremental search. The "i_prompt" is just
> * a string. The "flag" determines whether
Fix some mg(1) warnings
Hi tech --
This diff cleans up some warnings found with WARNINGS=yes and
compiling with both cc and clang. I ignored the -Wsign-compare
and -Wmissing-prototypes warnings.
~Brian
Index: dir.c
===
RCS file: /cvs/src/usr.bin/mg/dir.c,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 dir.c
--- dir.c 12 Sep 2016 18:32:54 - 1.29
+++ dir.c 29 May 2017 19:08:39 -
@@ -117,7 +117,7 @@ do_makedir(char *path)
{
struct stat sb;
int finished, ishere;
- mode_t dir_mode, mode, oumask;
+ mode_t dir_mode, f_mode, oumask;
char*slash;
if ((path = adjustname(path, TRUE)) == NULL)
@@ -131,8 +131,8 @@ do_makedir(char *path)
slash = path;
oumask = umask(0);
- mode = 0777 & ~oumask;
- dir_mode = mode | S_IWUSR | S_IXUSR;
+ f_mode = 0777 & ~oumask;
+ dir_mode = f_mode | S_IWUSR | S_IXUSR;
for (;;) {
slash += strspn(slash, "/");
@@ -152,8 +152,8 @@ do_makedir(char *path)
continue;
}
- if (mkdir(path, finished ? mode : dir_mode) == 0) {
- if (mode > 0777 && chmod(path, mode) < 0) {
+ if (mkdir(path, finished ? f_mode : dir_mode) == 0) {
+ if (f_mode > 0777 && chmod(path, f_mode) < 0) {
umask(oumask);
return (ABORT);
}
Index: fileio.c
===
RCS file: /cvs/src/usr.bin/mg/fileio.c,v
retrieving revision 1.103
diff -u -p -u -p -r1.103 fileio.c
--- fileio.c28 Jul 2016 21:40:25 - 1.103
+++ fileio.c29 May 2017 19:08:39 -
@@ -215,6 +215,7 @@ int
fbackupfile(const char *fn)
{
struct stat sb;
+ struct timespec new_times[2];
int from, to, serrno;
ssize_t nread;
char buf[BUFSIZ];
@@ -268,7 +269,6 @@ fbackupfile(const char *fn)
(void) fchmod(to, (sb.st_mode & 0777));
/* copy the mtime to the backupfile */
- struct timespec new_times[2];
new_times[0] = sb.st_atim;
new_times[1] = sb.st_mtim;
futimens(to, new_times);
Index: modes.c
===
RCS file: /cvs/src/usr.bin/mg/modes.c,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 modes.c
--- modes.c 19 Mar 2015 21:22:15 - 1.20
+++ modes.c 29 May 2017 19:08:39 -
@@ -23,14 +23,14 @@ struct maps_s *defb_modes[PBMODES] = { &
int defb_flag = 0;
int
-changemode(int f, int n, char *mode)
+changemode(int f, int n, char *newmode)
{
int i;
struct maps_s *m;
- if ((m = name_mode(mode)) == NULL) {
+ if ((m = name_mode(newmode)) == NULL) {
dobeep();
- ewprintf("Can't find mode %s", mode);
+ ewprintf("Can't find mode %s", newmode);
return (FALSE);
}
if (!(f & FFARG)) {
Index: re_search.c
===
RCS file: /cvs/src/usr.bin/mg/re_search.c,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 re_search.c
--- re_search.c 19 Mar 2015 21:22:15 - 1.31
+++ re_search.c 29 May 2017 19:08:40 -
@@ -420,17 +420,17 @@ re_backsrch(void)
* some do-it-yourself control expansion.
*/
static int
-re_readpattern(char *prompt)
+re_readpattern(char *re_prompt)
{
static int dofree = 0;
int flags, error, s;
chartpat[NPAT], *rep;
if (re_pat[0] == '\0')
- rep = eread("%s: ", tpat, NPAT, EFNEW | EFCR, prompt);
+ rep = eread("%s: ", tpat, NPAT, EFNEW | EFCR, re_prompt);
else
rep = eread("%s: (default %s) ", tpat, NPAT,
- EFNUL | EFNEW | EFCR, prompt, re_pat);
+ EFNUL | EFNEW | EFCR, re_prompt, re_pat);
if (rep == NULL)
return (ABORT);
if (rep[0] != '\0') {
Index: search.c
===
RCS file: /cvs/src/usr.bin/mg/search.c,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 search.c
--- search.c19 Mar 2015 21:22:15 - 1.44
+++ search.c29 May 2017 19:08:40 -
@@ -542,16 +542,16 @@ is_prompt(int dir, int flag, int success
}
/*
- * Prompt writing routine for the incremental search. The "prompt" is just
+ * Prompt writing routine for the incremental search. The "i_prompt" is just
* a string. The "flag" determines whether pat should be printed.
*/
static void
-is_dspl(char *prompt, int flag)
+is_dspl(char *i_prompt, int flag)
{
if (flag != FALSE)
- ewprintf("%s: ", prompt);
+ ewprintf("%s: ", i_prompt);
