Merge 1.1 upstream changes

Makefile

@@ -1,4 +1,4 @@
-VERSION=1.0
+VERSION=1.1
 ARCHIVE=minsk-$(VERSION).tar.gz
 
 CC=gcc
@@ -8,15 +8,15 @@ CFLAGS=-O2 -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -W
 all: minsk
 
 web: minsk
-	rsync -avzP . jw:www/minsk/ --exclude=.git --exclude=.*.swp --delete
+	rsync -avzP . jw:www/ext/minsk/ --exclude=.git --exclude=.*.swp --delete
 
 release:
 	git tag v$(VERSION)
 	git push --tags
 	git archive --format=tar --prefix=minsk-$(VERSION)/ HEAD | gzip >$(ARCHIVE)
-	scp $(ARCHIVE) atrey:~ftp/pub/local/mj/minsk/
-	ssh jw "cd www && bin/release-prog minsk $(VERSION)"
-	mv $(ARCHIVE) ~/archives/mj/
+	scp $(ARCHIVE) jw:~ftp/pub/mj/minsk/
+	ssh jw "cd web && bin/release-prog minsk $(VERSION)"
+	mv $(ARCHIVE) ~/archives/sw/minsk/
 
 clean:
 	rm -f `find . -name "*~" -or -name "*.[oa]" -or -name core -or -name .depend -or -name .#*`

index.cgi

@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use lib '../lib';
+use lib '../../lib/perl';
 use UCW::CGI;
 use File::Temp;
 use POSIX;
@@ -74,6 +74,6 @@ EOF
 
 print <<EOF ;
 <hr>
-<p>Written by <a href='http://mj.ucw.cz/'>Martin Mareš</a>. Version 1.0 (2010-12-27).
+<p>Written by <a href='http://mj.ucw.cz/'>Martin Mareš</a> and Rutger van Bergen. Version 1.1 (2022-04-24).
 </body></html>
 EOF

minsk.c

@@ -1284,7 +1284,7 @@ static void init_memory(int set_password)
       // not +00 00 0000 0000 (NOP). Otherwise, an empty program would reveal
       // the location of the password :)
       for (int i=0; i<memblocks; i++)
-        for (int j=0; i<MEM_SIZE; j++)
+        for (int j=0; j<MEM_SIZE; j++)
           mem[i][j] = 01000000000000ULL;
 
       // Store the password