Use K_TRIM getstr() mode when prompting for filenames

Don't need no stinking pre/appended white-space in our filenames!

src/sbbs3/execfunc.cpp

@@ -281,14 +281,14 @@ int sbbs_t::exec_function(csi_t *csi)
 			if(!chksyspass())
 				return(0);
 			bputs(text[Filename]);
-			if(getstr(str,60,0))
+			if(getstr(str,60,K_TRIM))
 				printfile(str,0);
 			return(0);
 		case CS_EDIT_TEXT_FILE:              /* Edit ASCII/Ctrl-A file */
 			if(!chksyspass())
 				return(0);
 			bputs(text[Filename]);
-			if(getstr(str,60,0))
+			if(getstr(str,60,K_TRIM))
 				editfile(str);
 			return(0);
 		case CS_GURU_LOG:

src/sbbs3/upload.cpp

@@ -276,7 +276,7 @@ bool sbbs_t::upload(uint dirnum)
 
 	f.dir=curdirnum=dirnum;
 	bputs(text[Filename]);
-	if(getstr(fname, sizeof(fname) - 1, 0) < 1 || !checkfname(fname)) {
+	if(getstr(fname, sizeof(fname) - 1, K_TRIM) < 1 || !checkfname(fname)) {
 		if(fname[0])
 			bprintf(text[BadFilename], fname);
 		return(false); 
@@ -336,6 +336,10 @@ bool sbbs_t::upload(uint dirnum)
 				if(!dir_op(dirnum))
 					return(false); 	 /* File is in database for another dir */
 			}
+			if(msgabort(true)) {
+				bputs(text[SearchedForDupes]);
+				return false;
+			}
 		}
 	}
 	bputs(text[SearchedForDupes]);