From 57c23dcedeb448769e66761a5e2faa7320427b9f Mon Sep 17 00:00:00 2001
From: foswret <foswret@posteo.com>
Date: Sun, 22 Jun 2025 15:05:58 -0500
Subject: added key image to README.md

---
 .gitignore |   2 +-
 Makefile   |   7 ++---
 README.md  |   7 +++--
 main.c     | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 password.c |  81 -----------------------------------------------
 5 files changed, 113 insertions(+), 89 deletions(-)
 create mode 100644 main.c
 delete mode 100644 password.c

diff --git a/.gitignore b/.gitignore
index 53752db..a713bf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-output
+spwdg
diff --git a/Makefile b/Makefile
index e7b7489..ef12eb2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
-password: password.c
-	gcc -o output password.c -lsodium
-install: all
-	cp output spwdg
+main: main.c
+	gcc -o spwdg main.c -lsodium
+install:
 	sudo mv spwdg /usr/bin	
 uninstall: 
 	sudo rm /usr/bin/spwdg
diff --git a/README.md b/README.md
index 8cd127c..57d633e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # SPWDG
+![Key illustration, coutesy of Wikimedia Commons](https://commons.wikimedia.org/wiki/File:JapanHomes141_KEY_TO_KURA_,_AND_BUNCH_OF_KEYS.jpg)
 This is a simple password generator written in C. All randomness is produced by the [libsodium](https://github.com/jedisct1/libsodium) library.
 
 ## Dependencies
@@ -7,10 +8,10 @@ This is a simple password generator written in C. All randomness is produced by
 - libsodium
 
 ## Install
-- make
-- sudo make install
+- `make`
+- `sudo make install`
 
 ## Uninstall
-- sudo make uninstall
+- `sudo make uninstall`
 
 
diff --git a/main.c b/main.c
new file mode 100644
index 0000000..66bb64e
--- /dev/null
+++ b/main.c
@@ -0,0 +1,105 @@
+#include <sodium/randombytes.h>
+#include <stdio.h>
+#include <string.h>
+#include <sodium.h>
+#include <unistd.h>
+#include <ctype.h> //To Upper
+
+
+long count_lines(FILE *File) { 
+    char c;
+    long line_counter = 0;
+    while ((c = getc(File)) != EOF) {
+        if (c == '\n') {
+            line_counter++;
+        }
+    }
+    return(line_counter);
+}
+
+void randomize_case(char *a) { // Accepts a string as input
+    for (int i = 0; i < strlen(a); i++) {
+        int coin = randombytes_uniform(2); // Decide if the current character will be capitalized or lowercase
+        if (coin == 1) {
+            a[i] = toupper(a[i]);
+        }
+    }
+}
+
+void generate_integers(void) {
+    int length = 5; // TO-DO: Make random eventually
+    for (int i=0; i<length; i++) {
+        int random = randombytes_uniform(length);
+        printf("%d", random);
+    }
+}
+
+void generate_characters(char *set) {
+    int random_length;
+    // while (random_length <= 3) random_length 
+    for (int i = 0; i < 5; i++) {
+        int random_character = randombytes_uniform(strlen(set));
+        printf("%c", set[random_character]);
+    }
+}
+
+int main (int argc, char **argv) {
+    char a, arg, str[20];
+    long line_counter, line_total, r;
+    FILE *words;
+
+    int index;
+    int f_flag = 0; 
+    int c;
+    opterr = 0;
+
+    char character_set[28] = "!@#$%^&*()_-+={}[]|~`<,>.?:;";
+    char letter_set[26] = "abcdefghijklmnopqrstuvwxyz";
+
+    while ((c = getopt (argc, argv, "n")) != -1)
+        switch(c) {
+            case 'n':
+            case '?':
+                if (optopt == 'c')
+                    fprintf (stderr, "Option -%c requires an argument.\n", optopt);
+                else if (isprint (optopt))
+                    fprintf (stderr, "Unknown option '-%c',\n", optopt);
+                else
+                    fprintf (stderr, "Unknown option character '\\x%x.\n", optopt);
+                return 1;
+            default:
+                abort();
+        }
+
+    if (sodium_init() < 0) return 1;    
+    words = fopen("word_list.txt", "r");
+
+    line_total = count_lines(words);
+    fseek(words, 0, SEEK_SET); // Reset pointer to beginning of file
+
+    char temp[2]; // Cannot copy c directly to str. needs a buffer
+    temp[1] = '\0'; // Makes the array a string
+
+    r = randombytes_uniform(line_total + 1); // Generates random line number to use for string
+                                             
+    while ((a = getc(words)) != EOF) {
+        int i;
+        temp[0] = a;
+        if ((r == i) && (a != '\n')) { 
+            strcat(str, temp); 
+        }
+        if (a == '\n') {
+            i++;        }
+    }
+
+    randomize_case(str);
+    generate_integers();
+    generate_characters(letter_set);
+    // printf("%s", str);
+    generate_characters(character_set);
+
+    printf("\n");
+    fseek(words, 0, SEEK_SET); // Reset pointer to beginning of file //
+    fclose(words);
+}
+
diff --git a/password.c b/password.c
deleted file mode 100644
index 7cd6da9..0000000
--- a/password.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <sodium/randombytes.h>
-#include <stdio.h>
-#include <string.h>
-#include <sodium.h>
-#include <ctype.h> //To Upper
-
-
-long count_lines(FILE *File) { 
-    char c;
-    long line_counter = 0;
-    while ((c = getc(File)) != EOF) {
-        if (c == '\n') {
-            line_counter++;
-        }
-    }
-    return(line_counter);
-}
-
-void randomize_case(char *a) { // Accepts a string as input
-    for (int i = 0; i < strlen(a); i++) {
-        int coin = randombytes_uniform(2); // Decide if the current character will be capitalized or lowercase
-        if (coin == 1) {
-            a[i] = toupper(a[i]);
-        }
-    }
-}
-
-void generate_integers(void) {
-    int length = 5; // TO-DO: Make random eventually
-    for (int i=0; i<length; i++) {
-        int random = randombytes_uniform(length);
-        printf("%d", random);
-    }
-}
-
-void generate_characters(char *set) {
-    for (int i = 0; i < 5; i++) {
-        int random_character = randombytes_uniform(strlen(set));
-        printf("%c", set[random_character]);
-    }
-}
-
-int main (int argc, char **argv) {
-    char c, arg, str[20];
-    FILE *words;
-    long line_counter, line_total, r;
-
-    char character_set[28] = "!@#$%^&*()_-+={}[]|~`<,>.?:;";
-    char letter_set[26] = "abcdefghijklmnopqrstuvwxyz";
-
-    if (sodium_init() < 0) return 1;    
-    words = fopen("word_list.txt", "r");
-
-    line_total = count_lines(words);
-    fseek(words, 0, SEEK_SET); // Reset pointer to beginning of file
-
-    char temp[2]; // Cannot copy c directly to str. needs a buffer
-    temp[1] = '\0'; // Makes the array a string
-
-    r = randombytes_uniform(line_total + 1); // Generates random line number to use for string
-                                             
-    while ((c = getc(words)) != EOF) {
-        int i;
-        temp[0] = c;
-        if ((r == i) && (c != '\n')) { 
-            strcat(str, temp); 
-        }
-        if (c == '\n') {
-            i++;        }
-    }
-
-    randomize_case(str);
-    generate_integers();
-    printf("%s", str);
-    generate_characters(character_set);
-
-    printf("\n");
-    fseek(words, 0, SEEK_SET); // Reset pointer to beginning of file //
-    fclose(words);
-}
-
-- 
cgit v1.2.3