jaseg/lolcat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use wprintf and putwchar instead of printf

Browse source 
Thanks @BourgeoisBear
This commit is contained in:
jaseg 2018-12-02 13:24:10 +09:00
parent 29bc06513d
commit e913f914c4
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lolcat.c
View file

@ -65,13 +65,13 @@ void find_escape_sequences(wint_t c, int* state)
void usage() void usage()
{ {
printf("Usage: lolcat [-h horizontal_speed] [-v vertical_speed] [--] [FILES...]\n"); wprintf(L"Usage: lolcat [-h horizontal_speed] [-v vertical_speed] [--] [FILES...]\n");
exit(1); exit(1);
} }
void version() void version()
{ {
printf("lolcat version 0.1, (c) 2014 jaseg\n"); wprintf(L"lolcat version 0.1, (c) 2014 jaseg\n");
exit(0); exit(0);
} }
@ -154,7 +154,7 @@ int main(int argc, char** argv)
this_file_read_wchar = &fgetwc; this_file_read_wchar = &fgetwc;
f = fopen(*filename, "r"); f = fopen(*filename, "r");
if (!f) { if (!f) {
fprintf(stderr, "Cannot open input file \"%s\": %s\n", *filename, strerror(errno)); fwprintf(stderr, L"Cannot open input file \"%s\": %s\n", *filename, strerror(errno));
return 2; return 2;
} }
} }
@ -170,15 +170,15 @@ int main(int argc, char** argv)
} else { } else {
int ncc = offx * ARRAY_SIZE(codes) + (int)((i += wcwidth(c)) * freq_h + l * freq_v); int ncc = offx * ARRAY_SIZE(codes) + (int)((i += wcwidth(c)) * freq_h + l * freq_v);
if (cc != ncc) if (cc != ncc)
printf("\033[38;5;%hhum", codes[(cc = ncc) % ARRAY_SIZE(codes)]); wprintf(L"\033[38;5;%hhum", codes[(cc = ncc) % ARRAY_SIZE(codes)]);
} }
} }
} }
printf("%lc", c); putwchar(c);
if (escape_state == 2) if (escape_state == 2)
printf("\033[38;5;%hhum", codes[cc % ARRAY_SIZE(codes)]); wprintf(L"\033[38;5;%hhum", codes[cc % ARRAY_SIZE(codes)]);
} }
printf("\n\033[0m"); printf("\n\033[0m");
cc = -1; cc = -1;
@ -187,7 +187,7 @@ int main(int argc, char** argv)
fclose(f); fclose(f);
if (ferror(f)) { if (ferror(f)) {
fprintf(stderr, "Error reading input file \"%s\": %s\n", *filename, strerror(errno)); fwprintf(stderr, L"Error reading input file \"%s\": %s\n", *filename, strerror(errno));
return 2; return 2;
} }
} }