From dd685e3d8b35973be28a03cfa0c20cd2b35b5cbd Mon Sep 17 00:00:00 2001 From: jaseg Date: Wed, 27 Apr 2016 20:16:49 +0200 Subject: Formatting fixes --- censor | Bin 26088 -> 26088 bytes censor.c | 54 ++++++++-------- lolcat | Bin 40904 -> 40840 bytes lolcat.c | 210 +++++++++++++++++++++++++++++++-------------------------------- 4 files changed, 130 insertions(+), 134 deletions(-) diff --git a/censor b/censor index 7b9606e..94b83f7 100755 Binary files a/censor and b/censor differ diff --git a/censor.c b/censor.c index 80eabc8..7efe81e 100644 --- a/censor.c +++ b/censor.c @@ -27,47 +27,43 @@ #include #include - -#define ARRAY_SIZE(foo) (sizeof(foo)/sizeof(foo[0])) -const char codes[] = {39,38,44,43,49,48,84,83,119,118,154,148,184,178,214,208,209,203,204,198,199,163,164,128,129,93,99,63,69,33}; - int main(int argc, char **argv){ - char **inputs = argv+1; - char **inputs_end = argv+argc; - if(inputs == inputs_end){ - char *foo[] = {"-"}; - inputs = foo; - inputs_end = inputs+1; - } + char **inputs = argv+1; + char **inputs_end = argv+argc; + if(inputs == inputs_end){ + char *foo[] = {"-"}; + inputs = foo; + inputs_end = inputs+1; + } - setlocale(LC_ALL, ""); + setlocale(LC_ALL, ""); - for(char **filename=inputs; filename 0){ + while((c = fgetwc(f)) > 0){ if(strchr("acegmnopqrsuvwxyz", c)) printf("▄"); else if(strchr(".,:; \t\r\n", c)) printf("%lc", c); else printf("█"); - } + } - fclose(f); + fclose(f); - if(c != WEOF && c != 0){ - fprintf(stderr, "Error reading input file \"%s\": %s\n", *filename, strerror(errno)); - return 2; - } - } + if(c != WEOF && c != 0){ + fprintf(stderr, "Error reading input file \"%s\": %s\n", *filename, strerror(errno)); + return 2; + } + } } diff --git a/lolcat b/lolcat index 682cf60..83fdf9a 100755 Binary files a/lolcat and b/lolcat differ diff --git a/lolcat.c b/lolcat.c index 324de5b..9e9cdc5 100644 --- a/lolcat.c +++ b/lolcat.c @@ -53,119 +53,119 @@ static char helpstr[] = "\n" const char codes[] = {39,38,44,43,49,48,84,83,119,118,154,148,184,178,214,208,209,203,204,198,199,163,164,128,129,93,99,63,69,33}; void find_escape_sequences(int c, int *state){ - if(c == '\033'){ /* Escape sequence YAY */ - *state = 1; - }else if(*state == 1){ - if(('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) - *state = 2; - }else{ - *state = 0; - } + if(c == '\033'){ /* Escape sequence YAY */ + *state = 1; + }else if(*state == 1){ + if(('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) + *state = 2; + }else{ + *state = 0; + } } void usage(){ - printf("Usage: lolcat [-h horizontal_speed] [-v vertical_speed] [--] [FILES...]\n"); - exit(1); + printf("Usage: lolcat [-h horizontal_speed] [-v vertical_speed] [--] [FILES...]\n"); + exit(1); } void version(){ - printf("lolcat version 0.1, (c) 2014 jaseg\n"); - exit(0); + printf("lolcat version 0.1, (c) 2014 jaseg\n"); + exit(0); } int main(int argc, char **argv){ - int c, cc=-1, i, l=0; - int colors=(isatty(1) == 1); - double freq_h = 0.23, freq_v = 0.1; - - struct timeval tv; - gettimeofday(&tv, NULL); - double offx = (tv.tv_sec%300)/300.0; - - for(i=1;i 0){ - if(colors){ - find_escape_sequences(c, &escape_state); - - if(!escape_state){ - if(c == '\n'){ - l++; - i = 0; - }else{ - int ncc = offx*ARRAY_SIZE(codes) + (int)((i+=wcwidth(c))*freq_h + l*freq_v); - if(cc != ncc) - printf("\033[38;5;%hhum", codes[(cc = ncc) % ARRAY_SIZE(codes)]); - } - } - } - - printf("%lc", c); - - if(escape_state == 2) - printf("\033[38;5;%hhum", codes[cc % ARRAY_SIZE(codes)]); - } - printf("\n\033[0m"); - cc = -1; - - fclose(f); - - if(c != WEOF && c != 0){ - fprintf(stderr, "Error reading input file \"%s\": %s\n", *filename, strerror(errno)); - return 2; - } - } + int c, cc=-1, i, l=0; + int colors=1; + double freq_h = 0.23, freq_v = 0.1; + + struct timeval tv; + gettimeofday(&tv, NULL); + double offx = (tv.tv_sec%300)/300.0; + + for(i=1;i 0){ + if(colors){ + find_escape_sequences(c, &escape_state); + + if(!escape_state){ + if(c == '\n'){ + l++; + i = 0; + }else{ + int ncc = offx*ARRAY_SIZE(codes) + (int)((i+=wcwidth(c))*freq_h + l*freq_v); + if(cc != ncc) + printf("\033[38;5;%hhum", codes[(cc = ncc) % ARRAY_SIZE(codes)]); + } + } + } + + printf("%lc", c); + + if(escape_state == 2) + printf("\033[38;5;%hhum", codes[cc % ARRAY_SIZE(codes)]); + } + printf("\n\033[0m"); + cc = -1; + + fclose(f); + + if(c != WEOF && c != 0){ + fprintf(stderr, "Error reading input file \"%s\": %s\n", *filename, strerror(errno)); + return 2; + } + } } -- cgit