Skip to content

Commit 3469c61

Browse files
committed
fix to short command names
1 parent 172ea4b commit 3469c61

File tree

4 files changed

+36
-36
lines changed

4 files changed

+36
-36
lines changed

src/buffer.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,10 @@ void delete_lines(void)
336336
void print_lines(void)
337337
{
338338
if(!buffer || !buffer->head)
339+
{
340+
printf("buffer is empty\n");
339341
return;
342+
}
340343

341344
struct line *head = buffer->head;
342345

src/exec.c

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -102,44 +102,44 @@ static void delete_data(const char *line)
102102

103103
static void builtin_help(void)
104104
{
105-
printf("quit - quit from program\n");
106-
printf("help - prints this help message\n");
107-
printf("clear - clean buffer\n");
108-
printf("print - print buffer\n");
109-
printf("append - append data to buffer\n");
110-
printf("write [file] - safe buffer to file\n");
111-
printf("read [file] - read file to buffer\n");
112-
printf("delete [line] - delete the specified line\n");
113-
printf("inserta [line] - insert after specified line\n");
114-
printf("insertb [line] - insert before specified line\n");
115-
printf("swap [line] [line] - swaps two lines\n");
105+
printf("q - quit from program\n");
106+
printf("h - prints this help message\n");
107+
printf("c - clean buffer\n");
108+
printf("p - print buffer\n");
109+
printf("a - append data to buffer\n");
110+
printf("w [file] - safe buffer to file\n");
111+
printf("r [file] - read file to buffer\n");
112+
printf("d [line] - delete the specified line\n");
113+
printf("ia [line] - insert after specified line\n");
114+
printf("ib [line] - insert before specified line\n");
115+
printf("s [line] [line] - swaps two lines\n");
116116
}
117117

118118
static int execute(struct command *cmd)
119119
{
120120
if(cmd == NULL)
121121
return SUCCESS_EXECUTE;
122-
else if(strcmp(cmd->name, "quit") == 0)
122+
else if(strcmp(cmd->name, "q") == 0)
123123
return QUIT_EXECUTE;
124-
else if(strcmp(cmd->name, "append") == 0)
124+
else if(strcmp(cmd->name, "a") == 0)
125125
append_data();
126-
else if(strcmp(cmd->name, "delete") == 0)
126+
else if(strcmp(cmd->name, "d") == 0)
127127
delete_data(cmd->parameter1);
128-
else if(strcmp(cmd->name, "inserta") == 0)
128+
else if(strcmp(cmd->name, "ia") == 0)
129129
inserta_data(cmd->parameter1);
130-
else if(strcmp(cmd->name, "insertb") == 0)
130+
else if(strcmp(cmd->name, "ib") == 0)
131131
insertb_data(cmd->parameter1);
132-
else if(strcmp(cmd->name, "swap") == 0)
132+
else if(strcmp(cmd->name, "s") == 0)
133133
swap(cmd->parameter1, cmd->parameter2);
134-
else if(strcmp(cmd->name, "print") == 0)
134+
else if(strcmp(cmd->name, "p") == 0)
135135
print_lines();
136-
else if(strcmp(cmd->name, "write") == 0)
136+
else if(strcmp(cmd->name, "w") == 0)
137137
write_lines(cmd->parameter1);
138-
else if(strcmp(cmd->name, "read") == 0)
138+
else if(strcmp(cmd->name, "r") == 0)
139139
read_lines(cmd->parameter1);
140-
else if(strcmp(cmd->name, "clear") == 0)
140+
else if(strcmp(cmd->name, "c") == 0)
141141
delete_lines();
142-
else if(strcmp(cmd->name, "help") == 0)
142+
else if(strcmp(cmd->name, "h") == 0)
143143
builtin_help();
144144
else
145145
printf("unknown command: %s\n", cmd->name);

src/misc.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ void help(void)
3535
printf("\t-v - shows the program version\n\n");
3636

3737
printf("[program commands]:\n");
38-
printf("\tquit - quit from program\n");
39-
printf("\thelp - prints help message\n");
40-
printf("\tclear - clean buffer\n");
41-
printf("\tprint - print buffer\n");
42-
printf("\tappend - append data to buffer\n");
43-
printf("\twrite [file] - safe buffer to file\n");
44-
printf("\tread [file] - read file to buffer\n");
45-
printf("\tdelete [line] - delete the specified line\n");
46-
printf("\tinserta [line] - insert after specified line\n");
47-
printf("\tinsertb [line] - insert before specified line\n");
48-
printf("\tswap [line] [line] - swaps two lines\n");
38+
printf("\tq - quit from program\n");
39+
printf("\th - prints short help message\n");
40+
printf("\tc - clean buffer\n");
41+
printf("\tp - print buffer\n");
42+
printf("\ta - append data to buffer\n");
43+
printf("\tw [file] - safe buffer to file\n");
44+
printf("\tr [file] - read file to buffer\n");
45+
printf("\td [line] - delete the specified line\n");
46+
printf("\tia [line] - insert after specified line\n");
47+
printf("\tib [line] - insert before specified line\n");
48+
printf("\ts [line] [line] - swaps two lines\n");
4949
}
5050

5151
void version(void)

src/parser.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ struct command* parse_command(const char *line)
4646
struct command *cmd = NULL;
4747

4848
if(strcmp(line, "\n") == 0)
49-
{
50-
fprintf(stdout, "empty line\n");
5149
return NULL;
52-
}
5350

5451
sline = strdup(line);
5552
if(!sline)

0 commit comments

Comments
 (0)