[Pgp-tools-commit] r862 - trunk/caff

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-07-11 22:36:10 +0000 (Mon, 11 Jul 2016)
New Revision: 862

Modified:
   trunk/caff/caff
Log:
caff: postpone loading the config file until after we've parsed the options.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-07-11 22:36:07 UTC (rev 861)
+++ trunk/caff/caff	2016-07-11 22:36:10 UTC (rev 862)
@@ -986,13 +986,7 @@
 my $KEYEDIT_SIGNUID_CLASS_PROMPT = qr/GET_LINE sign_uid\.class/;
 my $KEYEDIT_SIGNUID_PROMPT = qr/GET_BOOL sign_uid\.okay/;
 
-load_config();
 
-my $NOW = time;
-my  ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($NOW);
-my $DATE_STRING = sprintf("%04d-%02d-%02d", $year+1900, $mon+1, $mday);
-
-
 sub version($) {
     my ($fd) = @_;
     print $fd "$0 $VERSION - (c) 2004, 2005, 2006 Peter Palfrader et al.\n";
@@ -1392,6 +1386,13 @@
     exit(0);
 }
 
+load_config();
+
+my $NOW = time;
+my  ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($NOW);
+my $DATE_STRING = sprintf("%04d-%02d-%02d", $year+1900, $mon+1, $mday);
+
+
 if (-t \*STDIN) {
     # we're already talking to a TTY
     usage(\*STDERR, 1) unless @ARGV;