From f189b31e8086dab7ce713e92309275978e5a9cd7 Mon Sep 17 00:00:00 2001 From: Robyn Drake Date: Thu, 23 Dec 2021 12:54:09 -0600 Subject: [PATCH 1/2] interim commit of echo.c --- src/echo.c | 76 +++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/echo.c b/src/echo.c index 2b209fa..5ba4d97 100644 --- a/src/echo.c +++ b/src/echo.c @@ -3,44 +3,44 @@ #include int main(int argc, char *argv[]) { - bool newline = true; // Enables newline in the end (to disable use arg -n) - bool escapes = false; // Enables backslash-escaped characters (to enable use arg -e) - for (int i = 1; i < argc; i++) { - if (!strcmp(argv[i], "-n")) { - newline = false; - } else if (!strcmp(argv[i], "-e")) { - escapes = true; - } else if (!strcmp(argv[i], "-E")) { - escapes = false; - } else { - if (escapes) { - for (size_t j = 0; j < strlen(argv[i]); j++) { - if (argv[i][j] == '\\') { - j++; - switch(argv[i][j]) { - case 'b': - printf("\b"); - break; - case 'c': - return 0; - case 'e': - printf("\e"); - break; - case 'f': - printf("\f"); - break; - case 'n': - printf("\n"); - break; - case 'r': - printf("\r"); - break; - case 't': - printf("\t"); - break; - case 'v': - printf("\v"); - break; + bool newline = true; // Enables newline in the end (to disable use arg -n) + bool escapes = false; // Enables backslash-escaped characters (to enable use arg -e) + for (int i = 1; i < argc; i++) { + if (!strcmp(argv[i], "-n")) { + newline = false; + } else if (!strcmp(argv[i], "-e")) { + escapes = true; + } else if (!strcmp(argv[i], "-E")) { + escapes = false; + } else { + if (escapes) { + for (size_t j = 0; j < strlen(argv[i]); j++) { + if (argv[i][j] == '\\') { + j++; + switch(argv[i][j]) { + case 'b': + putchar('\b'); + break; + case 'c': + return 0; + case 'e': + putchar('\e'); + break; + case 'f': + putchar('\f'); + break; + case 'n': + putchar('\n'); + break; + case 'r': + putchar('\r'); + break; + case 't': + putchar('\t'); + break; + case 'v': + putchar('\v'); + break; case '\\': printf("\\"); break; From 51aa3b2a68e3124234550a85014bbef4bd9f440e Mon Sep 17 00:00:00 2001 From: Robyn Drake Date: Sat, 25 Dec 2021 02:44:04 -0600 Subject: [PATCH 2/2] echo.c done?? --- src/echo.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/echo.c b/src/echo.c index 5ba4d97..9e1afd9 100644 --- a/src/echo.c +++ b/src/echo.c @@ -41,25 +41,25 @@ int main(int argc, char *argv[]) { case 'v': putchar('\v'); break; - case '\\': - printf("\\"); - break; - default: - printf("\\%c", argv[i][j]); - } - } else { - printf("%c", argv[i][j]); - } - } - } else { - printf("%s", argv[i]); - } - if (i < argc - 1) - printf(" "); - } - } - if (newline) { - printf("\n"); - } - return 0; + case '\\': + putchar("\\"); + break; + default: + printf("\\%c", argv[i][j]); + } + } else { + printf("%c", argv[i][j]); + } + } + } else { + printf("%s", argv[i]); + } + if (i < argc - 1) + putchar(' '); + } + } + if (newline) { + putchar('\n'); + } + return 0; }