Move 199[1-3]/ant and 2015/howe alt code
The unobfuscated code, which was put in deobfuscated/, has been turned into alt code. In one case the already existing alt code was made alt2 and the unobfuscated code was alt. In the case of the ones with two C files there, the one that did not require modification (to compile in modern systems) were used as those are original. In a few cases these changes suggested additional files: a test suite Makefile for the alt code, a try.alt.sh script and maybe some other things besides. The bug status was updated for 2015/howe with a known bug: in particular the test scripts do not work (at least not completely). In the manifest all references (except for a file name that has not been renamed - at least not yet) of 'deobfuscated' to 'unobfuscated': a minor detail that might not matter much but it sounds ever so slightly better (maybe). These other entries that had an entry_text change were 1995/garry and 2020/endoh2. Rebuilt .entry.json and index.html files for this (and in the case of the moved code the index.html files also had to be changed for that in addition to the Makefiles).
This commit is contained in:
Cody Boone Ferguson committed
1 parent
c9ca6b4150
commit
92139c55d7
53 files changed
+993
-1740
No files matched your search
+5
-13
@@ -42,15 +42,15 @@
|
||||
"entry_text" : "script to try entry"
|
||||
},
|
||||
{
|
||||
"file_path" : "deobfuscated/ant.c",
|
||||
"file_path" : "ant.alt.c",
|
||||
"inventory_order" : 140,
|
||||
"OK_to_edit" : true,
|
||||
"display_as" : "c",
|
||||
"display_via_github" : true,
|
||||
"entry_text" : "author provided deobfuscated code"
|
||||
"entry_text" : "author provided unobfuscated code"
|
||||
},
|
||||
{
|
||||
"file_path" : "deobfuscated/sleep.c",
|
||||
"file_path" : "sleep.c",
|
||||
"inventory_order" : 140,
|
||||
"OK_to_edit" : true,
|
||||
"display_as" : "c",
|
||||
@@ -73,21 +73,13 @@
|
||||
"display_via_github" : true,
|
||||
"entry_text" : "Makefile to demonstrate entry"
|
||||
},
|
||||
{
|
||||
"file_path" : "deobfuscated/Makefile",
|
||||
"inventory_order" : 150,
|
||||
"OK_to_edit" : true,
|
||||
"display_as" : "makefile",
|
||||
"display_via_github" : true,
|
||||
"entry_text" : "author provided Makefile for deobfuscated code"
|
||||
},
|
||||
{
|
||||
"file_path" : "try.alt.sh",
|
||||
"inventory_order" : 150,
|
||||
"OK_to_edit" : true,
|
||||
"display_as" : "shellscript",
|
||||
"display_via_github" : true,
|
||||
"entry_text" : "script to try deobfuscated code"
|
||||
"entry_text" : "script to try unobfuscated code"
|
||||
},
|
||||
{
|
||||
"file_path" : "ant.test.alt.mk",
|
||||
@@ -95,7 +87,7 @@
|
||||
"OK_to_edit" : true,
|
||||
"display_as" : "makefile",
|
||||
"display_via_github" : true,
|
||||
"entry_text" : "Makefile to demonstrate deobfuscated code"
|
||||
"entry_text" : "Makefile to demonstrate unobfuscated code"
|
||||
},
|
||||
{
|
||||
"file_path" : "1992_ant.tar.bz2",
|
||||
|
||||
+7
-21
@@ -117,8 +117,8 @@ OBJ= ${PROG}.o
|
||||
DATA=
|
||||
TARGET= ${PROG}
|
||||
#
|
||||
ALT_OBJ= deobfuscated/${PROG}.o
|
||||
ALT_TARGET= deobfuscated/${PROG}
|
||||
ALT_OBJ= ${PROG}.alt.o
|
||||
ALT_TARGET= ${PROG}.alt
|
||||
|
||||
|
||||
#################
|
||||
@@ -146,29 +146,15 @@ am: ant
|
||||
|
||||
# alternative executable
|
||||
#
|
||||
alt: data ${PROG}.alt
|
||||
alt: data ${ALT_TARGET}
|
||||
@${TRUE}
|
||||
|
||||
# We keep the alternate code, the deobfuscated code, and its Makefile, in the
|
||||
# deobfuscated directory but copy the compiled binaries to the entry directory,
|
||||
# to keep both directories clean, separating the two. The reason we copy the
|
||||
# binary to the entry directory is so one does not have to do:
|
||||
#
|
||||
# ./deobfuscated/ant
|
||||
#
|
||||
# but instead just:
|
||||
#
|
||||
# ./ant.alt
|
||||
#
|
||||
# while still using the Makefile provided with the deobfuscated code.
|
||||
#
|
||||
${PROG}.alt: deobfuscated/ant.c
|
||||
${MAKE} -C deobfuscated ant
|
||||
${CP} -v -f deobfuscated/ant ant.alt
|
||||
${PROG}.alt: ${PROG}.alt.c
|
||||
${CC} ${CFLAGS} $< -o $@ ${LDFLAGS}
|
||||
|
||||
am.alt: ant.alt
|
||||
rm -f am.alt
|
||||
ln deobfuscated/ant am.alt
|
||||
cp ant.alt am.alt
|
||||
cp am.alt am.safe.alt
|
||||
cp am.safe.alt am.alt
|
||||
rm -f am.safe.alt
|
||||
@@ -240,7 +226,7 @@ clean:
|
||||
clobber: clean
|
||||
${RM} -f ${TARGET} ${ALT_TARGET}
|
||||
${RM} -rf *.dSYM
|
||||
${RM} -f am am.safe am.alt am.safe.alt deobfuscated/ant ${PROG}.alt
|
||||
${RM} -f am am.safe am.alt am.safe.alt ${PROG}.alt
|
||||
${RM} -f node.* leaf.*
|
||||
@-if [ -e sandwich ]; then \
|
||||
${RM} -f sandwich; \
|
||||
|
||||
+2
-2
@@ -29,8 +29,8 @@ where `Makefile` is a Makefile to use and `rule` is an optional rule to use.
|
||||
|
||||
## Alternate code:
|
||||
|
||||
This version, [ant.c in deobfuscated/](%%REPO_URL%%/1992/ant/deobfuscated/ant.c), was provided by the
|
||||
author in 2024, and is a deobfuscated version.
|
||||
This version, [ant.alt.c](%%REPO_URL%%/1992/ant/ant.alt.c), was provided by the
|
||||
author in 2024, and is an unobfuscated version.
|
||||
|
||||
|
||||
## Alternate build:
|
||||
|
||||
File renamed without changes.
@@ -1,22 +0,0 @@
|
||||
#
|
||||
# Anthony's Editor
|
||||
#
|
||||
# IOCCC 1991
|
||||
#
|
||||
# Winner Best Utility
|
||||
#
|
||||
|
||||
CFLAGS = -Os -Wno-deprecated-non-prototype -Wno-unsequenced
|
||||
|
||||
all: build
|
||||
|
||||
build: ant sleep
|
||||
|
||||
clean:
|
||||
-rm -f ant
|
||||
|
||||
ant: ant.c
|
||||
${CC} ${CFLAGS} ant.c -o $@
|
||||
|
||||
sleep: sleep.c
|
||||
${CC} ${CFLAGS} sleep.c -o $@
|
||||
+6
-7
@@ -413,8 +413,8 @@ code</a> below.</p>
|
||||
<h2 id="try">Try:</h2>
|
||||
<pre><code> ./try.sh</code></pre>
|
||||
<h2 id="alternate-code">Alternate code:</h2>
|
||||
<p>This version, <a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/deobfuscated/ant.c">ant.c in deobfuscated/</a>, was provided by the
|
||||
author in 2024, and is a deobfuscated version.</p>
|
||||
<p>This version, <a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/ant.alt.c">ant.alt.c</a>, was provided by the
|
||||
author in 2024, and is an unobfuscated version.</p>
|
||||
<h2 id="alternate-build">Alternate build:</h2>
|
||||
<pre><code> make alt</code></pre>
|
||||
<h2 id="alternate-use">Alternate use:</h2>
|
||||
@@ -458,13 +458,12 @@ P1003 subcommittee.</p>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/Makefile">Makefile</a> - entry Makefile</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/ant.orig.c">ant.orig.c</a> - original source code</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/try.sh">try.sh</a> - script to try entry</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/deobfuscated/ant.c">deobfuscated/ant.c</a> - author provided deobfuscated code</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/deobfuscated/sleep.c">deobfuscated/sleep.c</a> - author provided code for those who need a nap</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/ant.alt.c">ant.alt.c</a> - author provided unobfuscated code</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/sleep.c">sleep.c</a> - author provided code for those who need a nap</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/ant.README.txt">ant.README.txt</a> - am man page</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/ant.test.mk">ant.test.mk</a> - Makefile to demonstrate entry</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/deobfuscated/Makefile">deobfuscated/Makefile</a> - author provided Makefile for deobfuscated code</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/try.alt.sh">try.alt.sh</a> - script to try deobfuscated code</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/ant.test.alt.mk">ant.test.alt.mk</a> - Makefile to demonstrate deobfuscated code</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/try.alt.sh">try.alt.sh</a> - script to try unobfuscated code</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1992/ant/ant.test.alt.mk">ant.test.alt.mk</a> - Makefile to demonstrate unobfuscated code</li>
|
||||
</ul>
|
||||
<h2 id="secondary-files">Secondary files</h2>
|
||||
<ul>
|
||||
|
||||
File renamed without changes.
+4
-4
@@ -10,7 +10,7 @@ if [[ -z "$CC" ]]; then
|
||||
CC="cc"
|
||||
fi
|
||||
|
||||
make CC="$CC" alt >/dev/null || exit 1
|
||||
make clobber CC="$CC" alt >/dev/null || exit 1
|
||||
|
||||
# clear screen after compilation so that only the entry is shown
|
||||
clear
|
||||
@@ -23,13 +23,13 @@ echo 1>&2
|
||||
|
||||
|
||||
|
||||
echo "$ ./am.alt Makefile am_clobber # clobber everything except am" 1>&2
|
||||
echo "$ ./am.alt Makefile am_alt_clobber # clobber everything except am" 1>&2
|
||||
read -r -n 1 -p "Press any key to continue: "
|
||||
echo 1>&2
|
||||
./am.alt Makefile am_clobber # clobber everything except am
|
||||
./am.alt Makefile am_alt_clobber # clobber everything except am.alt
|
||||
echo 1>&2
|
||||
|
||||
echo "$ ./am.alt ant.test.alt.mk # run the test Makefile with am" 1>&2
|
||||
echo "$ ./am.alt ant.test.alt.mk # run the test Makefile with am.alt" 1>&2
|
||||
read -r -n 1 -p "Press any key to continue: "
|
||||
echo 1>&2
|
||||
./am.alt ant.test.alt.mk # run the test Makefile with am.alt
|
||||
+1
-1
@@ -10,7 +10,7 @@ if [[ -z "$CC" ]]; then
|
||||
CC="cc"
|
||||
fi
|
||||
|
||||
make CC="$CC" all >/dev/null || exit 1
|
||||
make clobber CC="$CC" all >/dev/null || exit 1
|
||||
|
||||
# clear screen after compilation so that only the entry is shown
|
||||
clear
|
||||
|
||||
Reference in new issue
Block a user