More range parsing ([+-][0-9]+), partial [range]!cmd support

Author: Rob

README.md

@@ -1,10 +1,3 @@
 Micro Vi
 
 Similar commands to vi.
-
-
-Bugs
-----
-
-Display code is still being changed, currently the only way to quit is Ctrl-C.
-"Lolz".

command.c

@@ -230,44 +230,70 @@ void cmd_q(int argc, char **argv, int force, struct range *rng)
 
 void cmd_bang(int argc, char **argv, int force, struct range *rng)
 {
-	if(rng->start != -1 || rng->end != -1){
+	if(rng->start != -1){
 		/* rw!cmd command */
-		struct list *l;
+		struct list *l, *to_pipe;
+		char *free_me = argv_to_str(argc, argv);
+		char *cmd = strchr(free_me, '!') + 1;
 
-		if(argc < 2){
-			gui_status(GUI_ERR, "usage: [range]!cmd");
+		if(argc <= 1){
+			gui_status(GUI_ERR, "usage: range!cmd");
 			return;
 		}
 
-		/* FIXME: more than one arg.. herpaderp */
-		l = pipe_readwrite(argv[1], buffer_gethead(global_buffer));
+		if(--rng->start < 0)
+			rng->start = 0;
+		if(rng->end == -1)
+			rng->end = rng->start;
+
+		to_pipe = buffer_extract_range(global_buffer, rng);
+
+		l = pipe_readwrite(cmd, to_pipe ? to_pipe : buffer_gethead(global_buffer));
 
 		if(l){
 			if(l->data){
-				buffer_replace(global_buffer, l);
+				if(to_pipe){
+					struct list *inshere;
+
+					inshere = buffer_getindex(global_buffer, rng->start);
+
+					if(!inshere)
+						inshere = buffer_gettail(global_buffer);
+
+					buffer_insertlistafter(global_buffer, inshere, l);
+
+					list_free_nodata(to_pipe);
+					to_pipe = NULL;
+				}else{
+					buffer_replace(global_buffer, l);
+				}
+
 				buffer_modified(global_buffer) = 1;
 			}else{
 				list_free(l, free);
-				gui_status(GUI_ERR, "%s: no output", argv[1]);
+				gui_status(GUI_ERR, "%s: no output", cmd);
 			}
 		}else{
 			gui_status(GUI_ERR, "pipe_readwrite() error: %s", strerror(errno));
 		}
-		return;
-	}
 
-	if(argc == 1){
-		shellout("sh", NULL);
+		free(free_me);
+		if(to_pipe)
+			list_free(to_pipe, free);
 	}else{
-		char *cmd = argv_to_str(argc - 1, argv + 1);
-		shellout(cmd, NULL);
-		free(cmd);
+		if(argc == 1){
+			shellout("sh", NULL);
+		}else{
+			char *cmd = argv_to_str(argc - 1, argv + 1);
+			shellout(cmd, NULL);
+			free(cmd);
+		}
 	}
 }
 
 void cmd_e(int argc, char **argv, int force, struct range *rng)
 {
-	if(argc != 2){
+	if(argc != 2 || rng->start != -1 || rng->end != -1){
 		gui_status(GUI_ERR, "usage: e[!] fname");
 		return;
 	}
@@ -283,7 +309,7 @@ void cmd_e(int argc, char **argv, int force, struct range *rng)
 
 void cmd_new(int argc, char **argv, int force, struct range *rng)
 {
-	if(argc != 1){
+	if(argc != 1 || rng->start != -1 || rng->end != -1){
 		gui_status(GUI_ERR, "usage: new[!]");
 		return;
 	}
@@ -565,14 +591,28 @@ void command_run(char *in)
 	s = parserange(in, &rng, &lim);
 
 	if(!s){
-		gui_status(GUI_ERR, "couldn't parse range");
+		if(errno == ERANGE){
+			if(gui_confirm("range backwards, flip? ")){
+				int i = rng.start;
+				rng.start = rng.end;
+				rng.end = i;
+
+				i = strspn(in, "^$.%,-+0123456789");
+				s = in + i;
+				goto cont;
+			}
+		}else{
+			gui_status(GUI_ERR, "range out of limits");
+		}
+
 		return;
 	}else if(HAVE_RANGE && *s == '\0'){
 		/* just a number, move to that line */
 		gui_move(rng.start - 1, gui_x());
 		return;
 	}
 
+cont:
 	if(!HAVE_RANGE)
 		rng.start = rng.end = -1;
 

gui/gui.c

@@ -391,12 +391,17 @@ int gui_getstr(char **ps, const struct gui_read_opts *opts)
 	}
 }
 
-int gui_prompt(const char *p, char **pbuf, intellisensef f)
+void gui_printprompt(const char *p)
 {
-	struct gui_read_opts opts;
 	move(LINES - 1, 0);
 	gui_clrtoeol();
 	addstr(p);
+}
+
+int gui_prompt(const char *p, char **pbuf, intellisensef f)
+{
+	struct gui_read_opts opts;
+	gui_printprompt(p);
 
 	memset(&opts, 0, sizeof opts);
 	opts.bspc_cancel  = 1;
@@ -405,6 +410,18 @@ int gui_prompt(const char *p, char **pbuf, intellisensef f)
 	return gui_getstr(pbuf, &opts);
 }
 
+int gui_confirm(const char *p)
+{
+	int c;
+
+	gui_printprompt(p);
+	c = gui_getch();
+
+	if(c == 'y' || c == 'Y')
+		return 1;
+	return 0;
+}
+
 void gui_redraw()
 {
 	redrawwin(stdscr);

gui/gui.h

@@ -30,6 +30,7 @@ struct gui_read_opts
 
 int gui_getstr(char **ps, const struct gui_read_opts *);
 int gui_prompt(const char *p, char **, intellisensef);
+int gui_confirm(const char *p);
 #endif
 int gui_getch(void);
 int gui_peekch(void);

range.c

@@ -1,8 +1,11 @@
 #include <stdlib.h>
 #include <ctype.h>
+#include <errno.h>
 
 #include "range.h"
 
+extern void *stderr;
+
 static int	 number(char **, int, int);
 static char *getrange(char *, struct range *, int, int);
 
@@ -38,6 +41,32 @@ static int number(char **sp, int cur, int lim)
 				++*sp;
 				curv = cur+1;
 				return 1;
+
+			case '+':
+			case '-':
+			{
+				int chr = *s;
+				int i;
+
+				++*sp;
+
+				if(isdigit(**sp)){
+					number(sp, cur, lim);
+					i = curv;
+				}else{
+					i = cur;
+				}
+
+				if(chr == '+')
+					i += 2;
+				else
+					i -= 1;
+				curv = i;
+
+fprintf(stderr, "parsed, curv=%d (i=%d, chr=%c), *sp=\"%s\"\n",curv,i,chr,*sp);
+
+				return 1;
+			}
 		}
 
 	return 0;
@@ -75,10 +104,16 @@ char *parserange(char *in, struct range *rng, struct range *lim)
 
 	if(s > in){
 		/* validate range */
+fprintf(stderr, "rng = { %d, %d }, cur=%d, max=%d\n",
+	rng->start, rng->end,
+	lim->start, lim->end);
+
 		if(rng->start < 1 || rng->start > lim->end ||
-			 rng->end	 < 1 || rng->end	 > lim->end){
+			 rng->end < 1 || rng->end > lim->end){
+			errno = EINVAL;
 			return NULL;
 		}else if(rng->start > rng->end){
+			errno = ERANGE;
 			return NULL;
 		}
 	}

util/list.c

@@ -269,6 +269,17 @@ struct list *list_getindex(struct list *l, int i)
 	return l;
 }
 
+void list_free_nodata(struct list *l)
+{
+	struct list *del;
+	l = list_gethead(l);
+	while(l){
+		del = l;
+		l = l->next;
+		free(del);
+	}
+}
+
 void list_free(struct list *l, void (*f)(void *))
 {
 	struct list *del;
@@ -385,7 +396,8 @@ struct list *list_from_fd(int fd, int *haseol)
 				i = list_gettail(i);
 			}
 
-			*haseol = eol;
+			if(haseol)
+				*haseol = eol;
 
 			if(ferror(f)){
 				list_free(l, free);

util/list.h

@@ -35,7 +35,8 @@ struct list *list_getindex(struct list *, int);
 struct list *list_copy_range(struct list *l, void *(*f_dup)(void *), struct range *r);
 struct list *list_copy(      struct list *l, void *(*f_dup)(void *));
 
-void list_free(struct list *l, void (*f)(void *));
+void list_free(       struct list *l, void (*f)(void *));
+void list_free_nodata(struct list *l);
 
 struct list *list_from_fd(      int  fd,       int *haseol);
 struct list *list_from_file(    FILE *f,       int *haseol);

util/pipe.c

@@ -113,13 +113,17 @@ struct list *pipe_readwrite(const char *cmd, struct list *l)
 			close(parent_to_child[WRITE_FD]);
 			close(child_to_parent[READ_FD]);
 
-			if(dup2(parent_to_child[READ_FD],  STDIN_FILENO ) == -1 ||
-				 dup2(child_to_parent[WRITE_FD], STDOUT_FILENO) == -1 ||
-				 dup2(STDOUT_FILENO, STDERR_FILENO) == -1)
-
+			if(
+				dup2(parent_to_child[READ_FD],  STDIN_FILENO ) == -1 ||
+				dup2(child_to_parent[WRITE_FD], STDOUT_FILENO) == -1 ||
+				dup2(STDOUT_FILENO, STDERR_FILENO) == -1
+			){
 				exit(-1);
+			}
 
-			exit(system(cmd));
+			execlp("sh", "sh", "-c", cmd, NULL);
+			perror("exec()");
+			exit(-1);
 
 		default:
 		{