Merge pull request #2207 from xexyl/primenum00-try

Bug fix 2000/primenum/try.sh

2000/natori/Makefile

@@ -38,7 +38,8 @@ include ../../var.mk
 
 # Common C compiler warnings to silence
 #
-CSILENCE=
+CSILENCE= -Wno-error -Wno-implicit-function-declaration -Wno-implicit-int \
+	  -Wno-int-conversion -Wno-pointer-to-int-cast -Wno-unused-parameter
 
 # Common C compiler warning flags
 #
@@ -57,8 +58,7 @@ ARCH=
 
 # Defines that are needed to compile
 #
-CDEFINE= -Wno-error -Wno-implicit-function-declaration -Wno-implicit-int \
-	-Wno-int-conversion -Wno-pointer-to-int-cast -Wno-unused-parameter
+CDEFINE=
 
 # Include files that are needed to compile
 #

2000/primenum/try.sh

@@ -6,16 +6,13 @@
 # make sure CC is set so that when we do make CC="$CC" it isn't empty. Doing it
 # this way allows us to have the user specify a different compiler in an easy
 # way.
-if [[ -z "$CC" ]]; then
-    CC="cc"
-fi
+[[ -z "$CC" ]] && CC="cc"
 
 make CC="$CC" all >/dev/null || exit 1
 
 # clear screen after compilation so that only the entry is shown
 clear
 
-
 read -r -n 1 -p "Press any key to run: echo IOCCC 23209 | ./primenum 23209: "
 echo 1>&2
 echo IOCCC 23209 | ./primenum 23209
@@ -27,9 +24,9 @@ echo THIS MESSAGE IS IN ALL CAPS | ./primenum 32
 echo 1>&2
 
 rm -f try.sh.txt
-read -r -n 1 -p "Press any key to run: ./primenum 101 < try.sh | ./primenum n > try.sh.txt: "
+read -r -n 1 -p "Press any key to run: ./primenum 101 < try.sh | ./primenum 101 > try.sh.txt: "
 echo 1>&2
-./primenum 101 < try.sh | ./primenum n > try.sh.txt
+./primenum 101 < try.sh | ./primenum 101 > try.sh.txt
 echo 1>&2
 
 read -r -n 1 -p "Press any key to show try.sh.txt (space = next page, q = quit): "
@@ -37,8 +34,8 @@ echo 1>&2
 less -rEXFK try.sh.txt
 echo 1>&2
 
-echo "$ diff try.sh try.sh.txt"
-read -r -n 1 -p "Press any key to see diff (space = next page, q = quit): " 1>&2
-diff try.sh try.sh.txt | less -rEXFK
+read -r -n 1 -p "Press any key to run: diff -s try.sh try.sh.txt: " 1>&2
+echo 1>&2
+diff -s try.sh try.sh.txt
 
 rm -f try.sh.txt