Attachment #195813 for bug #227861

Lines 1-9 Link Here

(-)Makefile (-3 / +4 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= sc-im	3	PORTNAME= sc-im
4	PORTVERSION= 0.7.0	4	PORTVERSION= 0.7.0
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	CATEGORIES= math	6	PORTREVISION= 1
		7	CATEGORIES= math
7		8
8	MAINTAINER= bapt@FreeBSD.org	9	MAINTAINER= bapt@FreeBSD.org
9	COMMENT= Ncurses spreadsheet program for terminal	10	COMMENT= Ncurses spreadsheet program for terminal

Line 0 Link Here

(-)files/patch-cmds__command.c (+11 lines)
	1	--- cmds_command.c.orig 2018-08-03 06:04:39 UTC
	2	+++ cmds_command.c
	3	@@ -826,7 +826,7 @@ void do_commandmode(struct block * sb) {
	4	exec_cmd(line);
	5
	6	} else if ( inputline[0] == L'w' ) {
	7	- if (savefile() == 0 && ! wcscmp(inputline, L"wq")) shall_quit = 1;
	8	+ if (savefile() == 0 && ! wcsncmp(inputline, L"wq", 2)) shall_quit = 1;
	9
	10	} else if ( ! wcsncmp(inputline, L"file ", 5) ) {
	11

Line 0 Link Here

(-)files/patch-doc (+11 lines)
	1	--- doc.orig 2018-08-03 06:09:42 UTC
	2	+++ doc
	3	@@ -328,6 +328,8 @@ Commands for handling cell content:
	4	:w {file} Save the current spreadsheet as {file}.
	5	:w! {file} Save the current spreadsheet as {file}, forcing an overwrite
	6	if {file} already exists.
	7	+ :wq Save the current spreadsheet and quit SC-IM.
	8	+ :wq {file} Save the current spreadsheet as {file} and quit SC-IM.
	9
	10	:h Show this help.
	11	:help Show this help.




--- file.c.orig	2017-12-13 17:48:59 UTC
+++ file.c
@@ -202,7 +202,12 @@ int savefile() {
     del_range_chars(name, 0, 1 + force_rewrite);
     wordexp(name, &p, 0);
 
-    if (! force_rewrite && p.we_wordv[0] && file_exists(p.we_wordv[0])) {
+    if (wcslen(inputline) > 2 && (!p.we_wordv || !p.we_wordv[0])) {
+       sc_error("Trailing space(s)");
+       return -1;
+    }
+
+    if (! force_rewrite && p.we_wordv && p.we_wordv[0] && file_exists(p.we_wordv[0])) {
         sc_error("File already exists. Use \"!\" to force rewrite.");
         wordfree(&p);
         return -1;

Return to bug 227861

Line 0 Link Here

(-)files/patch-file.c (+16 lines)
	1	--- file.c.orig 2017-12-13 17:48:59 UTC
	2	+++ file.c
	3	@@ -202,7 +202,12 @@ int savefile() {
	4	del_range_chars(name, 0, 1 + force_rewrite);
	5	wordexp(name, &p, 0);
	6
	7	- if (! force_rewrite && p.we_wordv[0] && file_exists(p.we_wordv[0])) {
	8	+ if (wcslen(inputline) > 2 && (!p.we_wordv \|\| !p.we_wordv[0])) {
	9	+ sc_error("Trailing space(s)");
	10	+ return -1;
	11	+ }
	12	+
	13	+ if (! force_rewrite && p.we_wordv && p.we_wordv[0] && file_exists(p.we_wordv[0])) {
	14	sc_error("File already exists. Use \"!\" to force rewrite.");
	15	wordfree(&p);
	16	return -1;