X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=src%2Flib%2Fcmdline_rdline.c;h=44ad5eda90619c10a903110c20ac8286f2ccfc9a;hb=459a3fb8149c6112631c6c54ef02bc38bb52b950;hp=6c2d9dd7f051898e1da36bc6c4a03e9920cd51c5;hpb=36dfbc791ada2e788180a474299d25641f56903f;p=libcmdline.git

diff --git a/src/lib/cmdline_rdline.c b/src/lib/cmdline_rdline.c
index 6c2d9dd..44ad5ed 100644
--- a/src/lib/cmdline_rdline.c
+++ b/src/lib/cmdline_rdline.c
@@ -197,11 +197,11 @@ rdline_char_in(struct rdline *rdl, char c)
 #endif
 
 	if (rdl->status != RDLINE_RUNNING)
-		return -1;
+		return RDLINE_RES_NOT_RUNNING;
 
 	cmd = vt100_parser(&rdl->vt100, c);
 	if (cmd == -2)
-		return 0;
+		return RDLINE_RES_SUCCESS;
 
 	if (cmd >= 0) {
 		switch (cmd) {
@@ -283,7 +283,7 @@ rdline_char_in(struct rdline *rdl, char c)
 			if (cmd == CMDLINE_KEY_CTRL_D &&
 			    CIRBUF_IS_EMPTY(&rdl->left) &&
 			    CIRBUF_IS_EMPTY(&rdl->right)) {
-				return -2;
+				return RDLINE_RES_EOF;
 			}
 			if (!cirbuf_del_head_safe(&rdl->right)) {
 				display_right_buffer(rdl);
@@ -365,12 +365,12 @@ rdline_char_in(struct rdline *rdl, char c)
 						    &complete_state);
 				/* no completion or error */
 				if (ret <= 0) {
-					return 2;
+					return RDLINE_RES_COMPLETE;
 				}
 
 				tmp_size = strlen(tmp_buf);
 				/* add chars */
-				if (ret == 2) {
+				if (ret == RDLINE_RES_COMPLETE) {
 					i=0;
 					while(CIRBUF_GET_LEN(&rdl->right) + CIRBUF_GET_LEN(&rdl->left) <
 					      RDLINE_BUF_SIZE &&
@@ -380,7 +380,7 @@ rdline_char_in(struct rdline *rdl, char c)
 						i++;
 					}
 					display_right_buffer(rdl);
-					return 2; /* ?? */
+					return RDLINE_RES_COMPLETE; /* ?? */
 				}
 
 				/* choice */
@@ -397,7 +397,7 @@ rdline_char_in(struct rdline *rdl, char c)
 
 				rdline_redisplay(rdl);
 			}
-			return 2;
+			return RDLINE_RES_COMPLETE;
 
 		case CMDLINE_KEY_RETURN:
 		case CMDLINE_KEY_RETURN2:
@@ -411,7 +411,7 @@ rdline_char_in(struct rdline *rdl, char c)
 
 			if (rdl->validate)
 				rdl->validate(rdl, rdl->left_buf, CIRBUF_GET_LEN(&rdl->left)+2);
-			return 1;
+			return RDLINE_RES_VALIDATED;
 
 #ifndef NO_RDLINE_HISTORY
 		case CMDLINE_KEY_UP_ARR:
@@ -457,23 +457,23 @@ rdline_char_in(struct rdline *rdl, char c)
 			break;
 		}
 
-		return 0;
+		return RDLINE_RES_SUCCESS;
 	}
 
 	if (!isprint((int)c))
-		return 0;
+		return RDLINE_RES_SUCCESS;
 
 	/* standard chars */
 	if (CIRBUF_GET_LEN(&rdl->left) + CIRBUF_GET_LEN(&rdl->right) >= RDLINE_BUF_SIZE)
-		return 0;
+		return RDLINE_RES_SUCCESS;
 
 	if (cirbuf_add_tail_safe(&rdl->left, c))
-		return 0;
+		return RDLINE_RES_SUCCESS;
 
 	rdl->write_char(rdl, c);
 	display_right_buffer(rdl);
 
-	return 0;
+	return RDLINE_RES_SUCCESS;
 }