Index: Makefile =================================================================== --- Makefile (révision 476282) +++ Makefile (copie de travail) @@ -1,9 +1,10 @@ # $FreeBSD$ -PORTNAME= sc-im -PORTVERSION= 0.7.0 +PORTNAME= sc-im +PORTVERSION= 0.7.0 DISTVERSIONPREFIX= v -CATEGORIES= math +PORTREVISION= 1 +CATEGORIES= math MAINTAINER= bapt@FreeBSD.org COMMENT= Ncurses spreadsheet program for terminal Index: files/patch-cmds__command.c =================================================================== --- files/patch-cmds__command.c (nonexistent) +++ files/patch-cmds__command.c (copie de travail) @@ -0,0 +1,11 @@ +--- cmds_command.c.orig 2018-08-03 06:04:39 UTC ++++ cmds_command.c +@@ -826,7 +826,7 @@ void do_commandmode(struct block * sb) { + exec_cmd(line); + + } else if ( inputline[0] == L'w' ) { +- if (savefile() == 0 && ! wcscmp(inputline, L"wq")) shall_quit = 1; ++ if (savefile() == 0 && ! wcsncmp(inputline, L"wq", 2)) shall_quit = 1; + + } else if ( ! wcsncmp(inputline, L"file ", 5) ) { + Property changes on: files/patch-cmds__command.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-doc =================================================================== --- files/patch-doc (nonexistent) +++ files/patch-doc (copie de travail) @@ -0,0 +1,11 @@ +--- doc.orig 2018-08-03 06:09:42 UTC ++++ doc +@@ -328,6 +328,8 @@ Commands for handling cell content: + :w {file} Save the current spreadsheet as {file}. + :w! {file} Save the current spreadsheet as {file}, forcing an overwrite + if {file} already exists. ++ :wq Save the current spreadsheet and quit SC-IM. ++ :wq {file} Save the current spreadsheet as {file} and quit SC-IM. + + :h Show this help. + :help Show this help. Property changes on: files/patch-doc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-file.c =================================================================== --- files/patch-file.c (nonexistent) +++ files/patch-file.c (copie de travail) @@ -0,0 +1,16 @@ +--- 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; Property changes on: files/patch-file.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property