Adding user-input-prompt functionality to the client. Intermediate co…

…mmit 5.
tianguochun · Mar 6, 2012 · 88fb1ab · 88fb1ab
1 parent 165c78f
commit 88fb1ab
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/client_ftp.c b/client_ftp.c
@@ -26,16 +26,20 @@ int main(int argc, char* argv[])
 	//END: initialization
 
 
-	//int command = -1;
-	char lpwd[LENBUFFER], pwd[LENBUFFER], path[LENBUFFER];
+	struct command* cmd;
+	char lpwd[LENBUFFER], pwd[LENBUFFER];
 	char userinput[LENUSERINPUT];
-	char* paths[LENBUFFER];
 	while(1)
 	{
 		printf("\t> ");
 		fgets(userinput, LENUSERINPUT, stdin);
 		cmd = userinputtocommand(userinput);
+		if(!cmd)
+			continue;
+		printcommand(cmd);
 		// switch case on command
+		if(cmd->id == EXIT)
+			break;
 	}
 
 	/*

diff --git a/client_ftp.h b/client_ftp.h
@@ -15,3 +15,5 @@ struct command
 
 struct command* userinputtocommand(char [LENUSERINPUT]);
 
+void printcommand(struct command*);
+
diff --git a/client_ftp_functions.c b/client_ftp_functions.c
@@ -84,3 +84,18 @@ struct command* userinputtocommand(char s[LENUSERINPUT])
 	}
 }
 
+void printcommand(struct command* c)
+{
+	if(!DEBUG)
+		return;
+
+	printf("\t\tPrinting contents of the above command...\n");
+	printf("\t\tid = %d\n", c->id);
+	printf("\t\tnpaths = %d\n", c->npaths);
+	printf("\t\tpaths =\n");
+	int i;
+	for(i = 0; i < c->npaths; i++)
+		printf("\t\t\t%s\n", c->paths[i]);
+	printf("\n");
+}
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,5 @@ struct command

		struct command* userinputtocommand(char [LENUSERINPUT]);

		void printcommand(struct command*);