Merge branch 'master' into work

Update at Thu Jun 22 08:12:59 EDT 2017 by tim
Corrected coding error in tilde expansion of .include filenames.
2026-08-23 06:27:07 +02:00 · 2017-06-22 08:13:02 -04:00 · 2017-06-22 08:13:00 -04:00 · 2017-06-22 08:12:41 -04:00
2 changed files with 3 additions and 3 deletions
@@ -1 +1 @@
-1.5.82
+1.5.83
@@ -777,7 +777,7 @@ skip_ends:
 	 /* For ~/<path>, substitute tilde from $HOME */
 	 userpath = getenv("HOME");
 	 iname = (char *)MALLOC(strlen(userpath) + strlen(iptr));
-	 sprintf(fname, "%s%s", userpath, iptr + 1);
+	 sprintf(iname, "%s%s", userpath, iptr + 1);
      }
      else if (*iptr == '~') {
 	 /* For ~<user>/<path>, substitute tilde from getpwnam() */
@@ -791,7 +791,7 @@ skip_ends:
 	    if (pathstart) {
 	       *pathstart = '/';
 	       iname = (char *)MALLOC(strlen(userpath) + strlen(pathstart) + 1);
-	       sprintf(fname, "%s%s", userpath, pathstart);
+	       sprintf(iname, "%s%s", userpath, pathstart);
 	    }
 	    else {
 	       /* Almost certainly an error, but make the substitution anyway */
Author	SHA1	Message	Date
Tim Edwards	9d476bc25a	Merge branch 'master' into work	2017-06-22 08:13:02 -04:00
Tim Edwards	5ed3fcb3f1	Update at Thu Jun 22 08:12:59 EDT 2017 by tim	2017-06-22 08:13:00 -04:00
Tim Edwards	ab9659af17	Corrected coding error in tilde expansion of .include filenames.	2017-06-22 08:12:41 -04:00
@@ -1 +1 @@
 .5.82
 .5.83