From 9b7fa92052213a3f83b2e8a9eaf71e7a4bb0ded0 Mon Sep 17 00:00:00 2001 From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com> Date: Sun, 26 Nov 2023 11:57:23 -0800 Subject: [PATCH] Remove alt versions of 1991/cdupont --- 1991/cdupont/.gitignore | 2 -- 1991/cdupont/Makefile | 4 +-- 1991/cdupont/README.md | 35 -------------------- 1991/cdupont/cdupont.alt.c | 24 -------------- 1991/cdupont/cdupont.alt2.c | 64 ------------------------------------- thanks-for-fixes.md | 13 -------- 6 files changed, 2 insertions(+), 140 deletions(-) delete mode 100644 1991/cdupont/cdupont.alt.c delete mode 100644 1991/cdupont/cdupont.alt2.c diff --git a/1991/cdupont/.gitignore b/1991/cdupont/.gitignore index 65fb330c0..9accc2c55 100644 --- a/1991/cdupont/.gitignore +++ b/1991/cdupont/.gitignore @@ -1,5 +1,3 @@ cdupont -cdupont.alt -cdupont.alt2 cdupont.orig prog.orig diff --git a/1991/cdupont/Makefile b/1991/cdupont/Makefile index a4cdf5600..801c9a909 100644 --- a/1991/cdupont/Makefile +++ b/1991/cdupont/Makefile @@ -111,8 +111,8 @@ OBJ= ${PROG}.o DATA= TARGET= ${PROG} # -ALT_OBJ= ${PROG}.alt.o ${PROG}.alt2.o -ALT_TARGET= ${PROG}.alt ${PROG}.alt2 +ALT_OBJ= +ALT_TARGET= ################# diff --git a/1991/cdupont/README.md b/1991/cdupont/README.md index 96c6acb83..b06ccc4d1 100644 --- a/1991/cdupont/README.md +++ b/1991/cdupont/README.md @@ -4,11 +4,6 @@ make all ``` -There are two alt versions that demonstrate a problem that the code documents -(as an obfuscation technique) and what the judges document, respectively, so -that you can see what the results are. See [alternate code](#alternate-code) -below for more details. - ## To use: @@ -17,36 +12,6 @@ below for more details. ``` -## Alternate code: - -These two versions show what will happen if certain things are done that were -warned against: if you remove a comment and more so an unused `goto` label or if -you beautify it. The [cdupont.alt.c](cdupont.alt.c) is the one with both the -unused `goto` label and comments removed and the [cdupont.alt2.c](cdupont.alt2.c) -is beautified. This required changing the `s` macro to be `__FILE__` as -otherwise it would read in the original code which doesn't have the -modifications. - - -### Alternate build: - - -```sh -make alt -``` - - -### Alternate try: - - -```sh -./cdupont.alt -./cdupont.alt2 -``` - -Enjoy! :-) - - ## Judges' remarks: Why is the following label necessary? diff --git a/1991/cdupont/cdupont.alt.c b/1991/cdupont/cdupont.alt.c deleted file mode 100644 index 42b504e8e..000000000 --- a/1991/cdupont/cdupont.alt.c +++ /dev/null @@ -1,24 +0,0 @@ - /* common sense to nohonest programmer */ -#include -main(){int x ,gi=4,i,f,ri=1,httxkbl=1,m=012;long cd=0x5765248d,n; - char u[0x50][032];FILE *ind; - ind=fopen(s,t); for(i=0; i<0x1a; i++){goto daswjhkls;vhjsgfdy1l1gjhd:;} -/*borntorun.*/goto c0g0;cOgO:i=0;fclose(ind);c0gO: -x= u [gi][m]; - if( m==gi){x=0x70;f=0x68;}else goto cOg0 ; b:putchar(x); if( -!(n-httxkbl++)) -#define yank(x) putchar(x) - {httxkbl=1; yank(' ');goto - hxi;}goto bl; - daswjhkls: fgets(u[i], 0120, ind); - /*obfuscated, eh? */goto - vhjsgfdy1l1gjhd; - c0g0 : n=cd&0x40000000L>>0x1e; - goto cOgO; g6w: - if(x!=0x2e){i++;goto c0gO;}else /* -injail*/yank('\n');goto vhjsgfdyl1lgjhd; -cOg0 : -f=u[m][gi];goto b;bl:m=(i+1)*(4* -x+3*f)%032;gi=(i+1)*(x+2*f)%0x1a; goto g6w; - hxi:cd^= n= cd&(7<<3*(014-++ri)); -n >>=3*(12-ri); goto bl;vhjsgfdyl1lgjhd:;} diff --git a/1991/cdupont/cdupont.alt2.c b/1991/cdupont/cdupont.alt2.c deleted file mode 100644 index 6b3b72426..000000000 --- a/1991/cdupont/cdupont.alt2.c +++ /dev/null @@ -1,64 +0,0 @@ - /* common sense to nohonest programmer */ -#include -main () -{ - int x, gi = 4, i, f, ri = 1, httxkbl = 1, m = 012; - long cd = 0x5765248d, n; - char u[0x50][032]; - FILE *ind; - ind = fopen (s, t); - for (i = 0; i < 0x1a; i++) - { - goto daswjhkls; - vhjsgfdy1l1gjhd:; - } -/*borntorun.*/ goto c0g0; -cOgO:i = 0; - fclose (ind); -c0gO: - x = u[gi][m]; -sorryfor_this_unused_but_very_needed_label: - if (m == gi) - { - x = 0x70; - f = 0x68; - } - else - goto cOg0; -b:putchar (x); - if (!(n - httxkbl++)) -#define yank(x) putchar(x) - { - httxkbl = 1; - yank (' '); - goto hxi; - } - goto bl; - /* hardlyundrstandable, but - likely to be missed if removed */ -daswjhkls:fgets (u[i], 0120, ind); - /*obfuscated, eh? */ goto - vhjsgfdy1l1gjhd; -c0g0:n = cd & 0x40000000L >> 0x1e; - goto cOgO; -g6w: - if (x != 0x2e) - { - i++; - goto c0gO; - } - else /* - injail */ - yank ('\n'); - goto vhjsgfdyl1lgjhd; -cOg0: - f = u[m][gi]; - goto b; -bl:m = (i + 1) * (4 * x + 3 * f) % 032; - gi = (i + 1) * (x + 2 * f) % 0x1a; - goto g6w; -hxi:cd ^= n = cd & (7 << 3 * (014 - ++ri)); - n >>= 3 * (12 - ri); - goto bl; -vhjsgfdyl1lgjhd:; -} diff --git a/thanks-for-fixes.md b/thanks-for-fixes.md index e6b1e94d6..47714e507 100644 --- a/thanks-for-fixes.md +++ b/thanks-for-fixes.md @@ -1096,19 +1096,6 @@ him): `k` for forward, `h` for left and `l` for right. This version also has a more useful way to exit, just entering `q` followed by enter. -## [1991/cdupont](1991/cdupont/cdupont.c) ([README.md](1991/cdupont/README.md])) - -Cody provided [two alternate](1991/cdupont/README.md#alternate-code) versions to -see what would happen if certain things were done that were warned against: [one -that has an unused `goto` label and a comment -removed](1991/cdupont/cdupont.alt.c) and [another that was -beautified](1991/cdupont/cdupont.alt2.c). - -This required changing the `s` macro to be `__FILE__` (which is more reliable -anyway) as otherwise it would read in the original code and not demonstrate the -problem. - - ## [1991/davidguy](1991/davidguy/davidguy.c) ([README.md](1991/davidguy/README.md])) As some systems like macOS can be particular about not declaring functions Cody