From 045939cb084a17a05f14b749c8ba02e1ac210070 Mon Sep 17 00:00:00 2001 From: Chris Nutter Date: Sat, 11 May 2019 23:03:45 -0700 Subject: [PATCH] organization --- .../newfiles}/__MACOSX/._diff_02.c | Bin .../newfiles}/__MACOSX/._left.txt | Bin .../newfiles}/__MACOSX/._para.c | Bin .../newfiles}/__MACOSX/._para.h | Bin .../newfiles}/__MACOSX/._right.txt | Bin .../newfiles}/__MACOSX/._util.c | Bin .../newfiles}/__MACOSX/._util.h | Bin {newfiles => deprecated/newfiles}/diff_02.c | 0 {newfiles => deprecated/newfiles}/diff_02.zip | Bin {newfiles => deprecated/newfiles}/left.txt | 0 {newfiles => deprecated/newfiles}/para.c | 0 {newfiles => deprecated/newfiles}/para.h | 0 {newfiles => deprecated/newfiles}/right.txt | 0 {newfiles => deprecated/newfiles}/util.c | 0 {newfiles => deprecated/newfiles}/util.h | 0 {oldfiles => deprecated/oldfiles}/diff_dep.c | 0 diff.c | 10 -------- diff.h | 10 ++++++++ helptxt.txt | 23 ------------------ versioninfo.txt | 8 ------ 20 files changed, 10 insertions(+), 41 deletions(-) rename {newfiles => deprecated/newfiles}/__MACOSX/._diff_02.c (100%) rename {newfiles => deprecated/newfiles}/__MACOSX/._left.txt (100%) rename {newfiles => deprecated/newfiles}/__MACOSX/._para.c (100%) rename {newfiles => deprecated/newfiles}/__MACOSX/._para.h (100%) rename {newfiles => deprecated/newfiles}/__MACOSX/._right.txt (100%) rename {newfiles => deprecated/newfiles}/__MACOSX/._util.c (100%) rename {newfiles => deprecated/newfiles}/__MACOSX/._util.h (100%) rename {newfiles => deprecated/newfiles}/diff_02.c (100%) rename {newfiles => deprecated/newfiles}/diff_02.zip (100%) rename {newfiles => deprecated/newfiles}/left.txt (100%) rename {newfiles => deprecated/newfiles}/para.c (100%) rename {newfiles => deprecated/newfiles}/para.h (100%) rename {newfiles => deprecated/newfiles}/right.txt (100%) rename {newfiles => deprecated/newfiles}/util.c (100%) rename {newfiles => deprecated/newfiles}/util.h (100%) rename {oldfiles => deprecated/oldfiles}/diff_dep.c (100%) delete mode 100644 helptxt.txt delete mode 100644 versioninfo.txt diff --git a/newfiles/__MACOSX/._diff_02.c b/deprecated/newfiles/__MACOSX/._diff_02.c similarity index 100% rename from newfiles/__MACOSX/._diff_02.c rename to deprecated/newfiles/__MACOSX/._diff_02.c diff --git a/newfiles/__MACOSX/._left.txt b/deprecated/newfiles/__MACOSX/._left.txt similarity index 100% rename from newfiles/__MACOSX/._left.txt rename to deprecated/newfiles/__MACOSX/._left.txt diff --git a/newfiles/__MACOSX/._para.c b/deprecated/newfiles/__MACOSX/._para.c similarity index 100% rename from newfiles/__MACOSX/._para.c rename to deprecated/newfiles/__MACOSX/._para.c diff --git a/newfiles/__MACOSX/._para.h b/deprecated/newfiles/__MACOSX/._para.h similarity index 100% rename from newfiles/__MACOSX/._para.h rename to deprecated/newfiles/__MACOSX/._para.h diff --git a/newfiles/__MACOSX/._right.txt b/deprecated/newfiles/__MACOSX/._right.txt similarity index 100% rename from newfiles/__MACOSX/._right.txt rename to deprecated/newfiles/__MACOSX/._right.txt diff --git a/newfiles/__MACOSX/._util.c b/deprecated/newfiles/__MACOSX/._util.c similarity index 100% rename from newfiles/__MACOSX/._util.c rename to deprecated/newfiles/__MACOSX/._util.c diff --git a/newfiles/__MACOSX/._util.h b/deprecated/newfiles/__MACOSX/._util.h similarity index 100% rename from newfiles/__MACOSX/._util.h rename to deprecated/newfiles/__MACOSX/._util.h diff --git a/newfiles/diff_02.c b/deprecated/newfiles/diff_02.c similarity index 100% rename from newfiles/diff_02.c rename to deprecated/newfiles/diff_02.c diff --git a/newfiles/diff_02.zip b/deprecated/newfiles/diff_02.zip similarity index 100% rename from newfiles/diff_02.zip rename to deprecated/newfiles/diff_02.zip diff --git a/newfiles/left.txt b/deprecated/newfiles/left.txt similarity index 100% rename from newfiles/left.txt rename to deprecated/newfiles/left.txt diff --git a/newfiles/para.c b/deprecated/newfiles/para.c similarity index 100% rename from newfiles/para.c rename to deprecated/newfiles/para.c diff --git a/newfiles/para.h b/deprecated/newfiles/para.h similarity index 100% rename from newfiles/para.h rename to deprecated/newfiles/para.h diff --git a/newfiles/right.txt b/deprecated/newfiles/right.txt similarity index 100% rename from newfiles/right.txt rename to deprecated/newfiles/right.txt diff --git a/newfiles/util.c b/deprecated/newfiles/util.c similarity index 100% rename from newfiles/util.c rename to deprecated/newfiles/util.c diff --git a/newfiles/util.h b/deprecated/newfiles/util.h similarity index 100% rename from newfiles/util.h rename to deprecated/newfiles/util.h diff --git a/oldfiles/diff_dep.c b/deprecated/oldfiles/diff_dep.c similarity index 100% rename from oldfiles/diff_dep.c rename to deprecated/oldfiles/diff_dep.c diff --git a/diff.c b/diff.c index d4ac62c..648098f 100644 --- a/diff.c +++ b/diff.c @@ -165,13 +165,3 @@ void loud(const char* filename1, const char* filename2) { else { normal(files[0], files[1]); } } - -// ================================================================ // - -/* - TODO: check line by line in a pagraph, using '|' for differences"); - TODO: this starter code does not yet handle printing all of fin1's pagraphs."); - TODO: handle the rest of diff's options"); - TODO: fix standard printing with no pameters"); - TODO: implement multiple types of pameters\n"); -*/ diff --git a/diff.h b/diff.h index 8f9ba97..41213a4 100644 --- a/diff.h +++ b/diff.h @@ -12,6 +12,16 @@ #define HASHLEN 200 #define BUFLEN 256 +// ================================================================ // + +/* + TODO: check line by line in a pagraph, using '|' for differences"); + TODO: this starter code does not yet handle printing all of fin1's pagraphs."); + TODO: handle the rest of diff's options"); + TODO: fix standard printing with no pameters"); + TODO: implement multiple types of pameters\n"); +*/ + // ================================================================= // FILE *fin1, *fin2; diff --git a/helptxt.txt b/helptxt.txt deleted file mode 100644 index 9347481..0000000 --- a/helptxt.txt +++ /dev/null @@ -1,23 +0,0 @@ -Usage: diff-rcm [OPTION]... FILES -Compare FILES line by line. - -Mandatory arguments to long options are mandatory for short options too. - --normal output a normal diff (the default) - -q, --brief report only when files differ - -s, --report-identical-files report when two files are the same - -c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context - -u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context - -y, --side-by-side output in two columns - - -i, --ignore-case ignore case differences in file contents - - --help display this help and exit - -v, --version output version information and exit - -FILES are 'FILE1 FILE2' -If --from-file or --to-file is given, there are no restrictions on FILE(s). -If a FILE is '-', read standard input. -Exit status is 0 if inputs are the same, 1 if different, 2 if trouble. - -Report bugs to: cdnutter@gmail.com -diff-rcm home page: diff --git a/versioninfo.txt b/versioninfo.txt deleted file mode 100644 index 5be0d9c..0000000 --- a/versioninfo.txt +++ /dev/null @@ -1,8 +0,0 @@ - ██ ██ ████ ████ - ░██░░ ░██░ ░██░ - ░██ ██ ██████ ██████ ██████ █████ ██████████ - ██████░██░░░██░ ░░░██░ █████░░██░░█ ██░░░██░░██░░██░░██ - ██░░░██░██ ░██ ░██ ░░░░░ ░██ ░ ░██ ░░ ░██ ░██ ░██ -░██ ░██░██ ░██ ░██ ░██ ░██ ██ ░██ ░██ ░██ -░░██████░██ ░██ ░██ ░███ ░░█████ ███ ░██ ░██ - ░░░░░░ ░░ ░░ ░░ ░░░ ░░░░░ ░░░ ░░ ░░