From 4dbe5cd8903ed83614d5659d39ea98e12d197361 Mon Sep 17 00:00:00 2001 From: Nicholas Tay Date: Fri, 3 Dec 2021 15:23:42 +1100 Subject: astyle K&R --- passgen.c | 150 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/passgen.c b/passgen.c index 89361e5..0aaa212 100644 --- a/passgen.c +++ b/passgen.c @@ -28,92 +28,92 @@ int main(int argc, char *argv[]) { - bool custom_grammar = false; - char *grammar = DEFAULT_GRAMMAR; - int grammar_size = sizeof(DEFAULT_GRAMMAR)-1; - - if (argc == 2) { - // Take first argument as the grammar - grammar = argv[1]; - grammar_size = strlen(grammar); - } else if (argc == 4) { - // Take arguments as triplets, specials, numbers - // atoi might be scuffed but so be it (it just goes = 0 if invalid input) - int triplets = atoi(argv[1]); - int specials = atoi(argv[2]); - int numbers = atoi(argv[3]); - - if (triplets < 1) { - fprintf(stderr, "ERROR: Cannot have less than one triplet."); - return 1; + bool custom_grammar = false; + char *grammar = DEFAULT_GRAMMAR; + int grammar_size = sizeof(DEFAULT_GRAMMAR)-1; + + if (argc == 2) { + // Take first argument as the grammar + grammar = argv[1]; + grammar_size = strlen(grammar); + } else if (argc == 4) { + // Take arguments as triplets, specials, numbers + // atoi might be scuffed but so be it (it just goes = 0 if invalid input) + int triplets = atoi(argv[1]); + int specials = atoi(argv[2]); + int numbers = atoi(argv[3]); + + if (triplets < 1) { + fprintf(stderr, "ERROR: Cannot have less than one triplet."); + return 1; + } + + grammar_size = triplets * 3 + specials + numbers; + grammar = malloc(grammar_size + 1); + if (grammar == NULL) { + perror("malloc"); + return 1; + } + grammar[grammar_size] = 0; + + memcpy(grammar, "Cvc", 3); + for (int i = 1; i < triplets; ++i) + memcpy(grammar + (i * 3), "cvc", 3); + + memset(grammar + (triplets * 3), '!', specials); + memset(grammar + (triplets * 3) + specials, '#', numbers); + custom_grammar = true; } - grammar_size = triplets * 3 + specials + numbers; - grammar = malloc(grammar_size + 1); - if (grammar == NULL) { - perror("malloc"); - return 1; + char *password = malloc(grammar_size + 1); + if (password == NULL) { + perror("malloc"); + return 1; } - grammar[grammar_size] = 0; - - memcpy(grammar, "Cvc", 3); - for (int i = 1; i < triplets; ++i) - memcpy(grammar + (i * 3), "cvc", 3); - - memset(grammar + (triplets * 3), '!', specials); - memset(grammar + (triplets * 3) + specials, '#', numbers); - custom_grammar = true; - } - - char *password = malloc(grammar_size + 1); - if (password == NULL) { - perror("malloc"); - return 1; - } - password[grammar_size] = 0; + password[grammar_size] = 0; #ifndef __linux__ - // seed RNG; this isn't very good, but it's enough(?) - srand(time(NULL) + getpid() % 420 - 69); + // seed RNG; this isn't very good, but it's enough(?) + srand(time(NULL) + getpid() % 420 - 69); #endif - - for (int i = 0; i < grammar_size; ++i) { - char c = grammar[i]; - - bool caps = false; - if (c >= 'A' && c <= 'Z') { - caps = true; - c += 'a' - 'A'; - } - char *class; - int class_size = 0; - switch (c) { - CLASSES - default: - fprintf(stderr, "ERROR: Invalid grammar character '%c'.\n", c); - if (custom_grammar) - free(grammar); - free(password); - return 1; - } - - do { + for (int i = 0; i < grammar_size; ++i) { + char c = grammar[i]; + + bool caps = false; + if (c >= 'A' && c <= 'Z') { + caps = true; + c += 'a' - 'A'; + } + + char *class; + int class_size = 0; + switch (c) { + CLASSES + default: + fprintf(stderr, "ERROR: Invalid grammar character '%c'.\n", c); + if (custom_grammar) + free(grammar); + free(password); + return 1; + } + + do { #ifdef __linux__ - unsigned int r; - getrandom(&r, sizeof(r), 0); + unsigned int r; + getrandom(&r, sizeof(r), 0); #else - long r = rand(); + long r = rand(); #endif - password[i] = class[r % class_size] - (caps ? 'a' - 'A' : 0); - } while (i != 0 && password[i] == password[i-1]); - } + password[i] = class[r % class_size] - (caps ? 'a' - 'A' : 0); + } while (i != 0 && password[i] == password[i-1]); + } - if (custom_grammar) - free(grammar); + if (custom_grammar) + free(grammar); - printf("%s\n", password); - free(password); + printf("%s\n", password); + free(password); - return 0; + return 0; } -- cgit