Revert "Fix wrong variable usage."

This reverts commit 0dc8f8ae521052351d35c1323dd8acded07bf411.

Fix -o showing wrong variable
Revert "Small cleanup. This warning has been here since 2010."

This reverts commit a378ae80c39a386d2ca96972e6ba6644beb269b1.

This is still a valid warning as a user may mistakingly put their
portmaster.rc file into /etc; they should be told where the proper
place is.
Fix argument too long errors

Addresses:	#7