Fix conflicts with recent commits (I think/hope)

Some commits this week caused some conflicts with some open pull
requests made last week. I believe and hope that I fixed the conflicts.

1988/rules.txt

@@ -0,0 +1,213 @@
+Subject: 5th International Obfuscated C Code Contest Rules
+Newsgroups: comp.lang.c,comp.unix.wizards
+Keywords: rules,1988,obfuscate,contest
+
+Copyright (c) 1988, Landon Curt Noll & Larry Bassel.
+All Rights Reserved.  Permission for personal, educational or non-profit use is
+granted provided this this copyright and notice are included in its entirety
+and remains unaltered.  All other uses must receive prior permission in writing
+from both Landon Curt Noll and Larry Bassel.
+
+	Obfuscate:  tr.v.  -cated, -cating, -cates.  1. a.  To render obscure.
+		b.  To darken.  2. To confuse:  Their emotions obfuscated their
+		judgement.  [LLat. obfuscare, to darken : ob(intensive) +
+		Lat. fuscare, to darken < fuscus, dark.] -obfuscation n.
+		obfuscatory adj.
+
+GOALS OF THE CONTEST:
+
+	* To write the most Obscure/Obfuscated C program under the rules below.
+	* To show what should NOT be done in C programs.
+	* To provide a safe forum for poor C code.  :-)
+
+RULES:
+
+	To help us handle the vast volume of entries, we ask that you
+	follow the rules below.  Sorry for the length, but we need all
+	the help we can get!
+
+	1) Your source MUST be 1536 bytes or less, and it must be a complete
+	   program, not just a subroutine.  NOTE the new maximum size.
+
+	2) To help us process your entries, we ask that you submit entries
+	   in the following format.  Please be sure to include the --- lines,
+	   otherwise our extraction program may skip your entry!
+
+---header items---
+name:    	Your name, of course!
+org:		School/Company/Organization
+email address: email address from a well known site
+postal address:	Postal address, include your country as well
+environment:	Indicate the Hardware & OS under which your program was tested
+entry:		A of B		<entry number such as 3 of 5, 1 of 1...>
+remarks:			<see below>
+---how to compile---
+X Give the command(s) needed to compile your program.
+X Follow the same rules as given for the program below except that the
+X command size must be 160 characters or less.
+---program---
+X Place obfuscated source of 1536 characters or less in this section.
+X Add a leading X to each line to avoid problems with mailers.
+X Some mailers don't like files with very long lines.  If your entry contains C
+C    lines longer 80 chars we ask you to form continuation line sets.  To form C
+C    a continuation line set, place a 'C' character at the point of a split C
+C    and place a C (instead of an X) at the beginning of the next line. C
+C    Finally, end the continuation line set as normal.
+X The C\nC's and leading X's will be removed prior to extraction and thus C
+C    they don't contribute toward the source character count.  All other C
+C    characters are considered to be source.
+X Newlines count as 1 character.  Assume a standard 8 character tab stop.
+---end---
+
+	3) Regarding the header items:
+
+	    * Any text outside of the above format will be kept confidential.
+
+	    * All header lines are required, but you may use 'annonymous'
+	      for any header line other than 'remarks' or 'entry'.
+
+	    * In the 'remarks' please include:
+		- what this program does
+		- why you think the program is obfuscated
+		- any other remarks you wish to make
+
+	4) Your entry should be written in common C. (K&R + common extensions)
+	   Due to the lack of ANSI C compilers, it is suggested, but not
+	   required, that you avoid use of constructs unque to ANSI C.
+
+	5) The program must be of original work.  All programs must be
+	   in the public domain.  All copyrighted programs will be rejected.
+
+	6) Entries must be received between 15-Mar-88 0:00 GMT and 
+	   25-May-88 0:00 GMT.  Email your entries to:
+	   
+			...!amdahl!obfuscate
+
+	   Amdahl talks to hplabs, decwrl, pyramid, sun, uunet, cbosgd, ...
+	   We will attempt to email a confirmation of receipt of contest
+	   entries, however since email is not reliable you may not receive it.
+	   People are strongly encouraged to submit entries via email, however
+	   one may mail entries the following postal address:
+
+		Landon Curt Noll
+		Amdahl Corp.
+		1250 E. Arques Ave.   M/S 316
+		P.O. Box 3470
+		Sunnyvale, CA
+		94088-3470
+		U.S.A.
+
+	  Write the words: "International Obfuscated C Code Contest" near the
+	  bottom left corner of the envelope.
+
+	7) Each person may submit up to 8 entries.  Multiple entries must
+	   be sent in separate emails or postal envelopes.
+
+
+ANNOUNCEMENT OF WINNERS:
+
+	* First announcement will be at the Summer 88 Usenix BOF.
+
+	* Winning entries will be posted to comp.sources.unix
+	  as well as news groups where these rules were posted
+	  in mid June 1988.  (depending on the judges work load ;-})
+
+	* An article containing the winning entries will be published
+	  in a future issue of the "Micro/Systems Journal".
+
+	* Winners receive international fame and flames!  :-)
+
+
+JUDGING:
+
+	Awards will be given to the best entry in a number of categories.
+	The actual category list will vary depending on the types of entries
+	we receive.  As a guide, consider using the following:
+
+		* The best small one line program
+		* The most obscure algorithm
+		* The strangest source layout
+		* The most useful obfuscated program
+		* The most creatively obfuscated program
+		* Best obfuscated entry smaller than 256 bytes
+		* Best obfuscated entry smaller than 1024 bytes
+		* <anything else so strange that it deserves an award>
+
+POINTS TO PONDER:
+
+	People are encouraged to examine winners of the previous contests.  A 
+	copy of these entries was posted to comp.sources.unix on or about 
+	15-Mar-88.  Contact the comp.sources.unix moderator, or some archive
+	site if you missed that posting.  Keep in mind that rules change from 
+	year to year, so some winning entries may not be valid entries this 
+	year.  What was unique and novel one year might be 'old' the next 
+	year.  In short, use your best judgement.
+
+	We examine each entry on several levels of confusion.  For example
+	each entry is judged when we:
+
+		* look at the original source
+		* run it through;  sed -e ',^#[	 ]*define,d' | /lib/cpp
+		* run it through a C beautifier
+		* examine the algorithm
+		* compile and lint it
+		* execute it
+	
+	One line programs are best when they are short, obscure and concise.
+
+	We tend to dislike programs that:
+
+		* are very hardware specific
+		* are very OS or Un*x version specific
+		     (index/strchr differences are ok, but 
+		      socket/streams specific code is likely not to be)
+		* dump core or have compiler warnings
+		     (it is ok only if you warn us in the 'remark' header item)
+		* won't compile under both BSD or SYS V Un*x
+		* use an excessively long compile line to get around the
+		     size limit
+		* are longer than they need to be
+		* are similar to previous winners
+		* are similar to previous losers  :-)
+
+	Simply abusing #defines or -Dfoo=bar won't go as far as a program
+	that is more well rounded in confusion.
+
+	Unless you are crampt for space, or unless you are entering the 
+	'best one liner' category, we suggest that you format your program 
+	in a more creative way than simply forming excessively long lines.
+
+	We like programs that:
+
+		* are as concise and small as they need to be
+		* do something quasi-interesting
+		* pass lint without complaint
+		* are portable
+		* are unique or novel in their obfuscation style
+		* use a number of different types of obfuscation
+		* make us laugh and/or throw up  :-)
+
+	Some types of programs can't excel in some areas.  We try to account
+	for this by giving awards to programs in a number of areas.  Of course,
+	your program doesn't have to excel in all areas, but doing well in a
+	few helps.
+
+	Be creative!
+
+	The Judging will be done by Landon Noll and Larry Bassel.  If you have
+	any QUESTIONS or COMMENTS, please feel free to send them to:
+
+			 ...!amdahl!judges
+
+	however contest entries should be sent to: 
+	
+			...!amdahl!obfuscate
+
+
+chongo <Landon Curt Noll> /\cc/\  	{decwrl,sun,uunet}!amdahl!chongo
+Larry Bassel			  	{amdahl,ucbvax,cbosgd}|sun!lab
+
+p.s. The 1988 contest has been dedicated to Bill the Cat.	     |\_.^
+   								     (@ o)
+							   *Ackpt!*   {:} 
+								       U