1 files changed, 29 insertions(+), 13 deletions(-)

M begin/login.c

@@ 6,6 6,8 @@
 #include <unistd.h>
 
 #define ARRAYSIZE(x)	((sizeof(x)/sizeof(*x))-1)
+#define NO_USER		(struct user_s){0,0}
+
 
 struct user_s {
 	char *name, *pass;


@@ 16,8 18,10 @@ main(int argc, char **argv)
 {
 	char *name = (char*)malloc(BUFSIZ*sizeof(char));
 	char *pass = (char*)malloc(BUFSIZ*sizeof(char));
+	struct user_s user = NO_USER;
 
-	struct user_s users[] = {
+	/* Set up users */
+	const struct user_s users[] = {
 		{ "Thomas", "acidophilus" },
 		{ "Diana" , "semnificant" },
 		{ "Morten", "monsoon" },


@@ 28,21 32,30 @@ main(int argc, char **argv)
 
 	scanf("%s", name);
 
-
-/*	int c = getchar(), i = 0;
-	for (;;) {
-		c = getch();
-		if (c == '\n' || c == EOF)
-			break;
-		*(pass + i++) = (char)c;
-		putchar('\b');
-		putchar('*');
+	/* Look for the user */
+	int i;
+	for (i = 0; i < ARRAYSIZE(users); i++) {
+		if (!strcmp(users[i].name, name)) {
+			user = users[i];
+			goto getpass;
+		}
 	}
-*/
+	goto wronguser;
+
+
+getpass:
 	pass = getpass("Please enter your password: ");
 
 	printf("Got password '%s'\n", pass);
+	if (!strcmp(user.pass, pass)) {
+		printf("Successfully logged in as: %s\n", name);
+		exit(0);
+	} else {
+		printf("Wrong password for user %s\n", name);
+		exit(1);
+	}
 
+	/*
 	int i;
 	for (i = 0 ; i < ARRAYSIZE(users); i++)
 		if (!strcmp(users[i].name, name)) {


@@ 55,7 68,10 @@ main(int argc, char **argv)
 				exit(1);
 			}
 		}
-	
-	printf("Login failed. User %s not found.\n", name);
+	*/
+
+wronguser:
+	printf("Login failed. User '%s' not found.\n", name);
 	exit(1);
+
 }