[Freemail] r9951 - trunk/apps/Freemail/src/freemail

[d...@freenetproject.org]

Author: dbkr
Date: 2006-08-07 19:36:08 +0000 (Mon, 07 Aug 2006)
New Revision: 9951

Modified:
   trunk/apps/Freemail/src/freemail/AccountManager.java
   trunk/apps/Freemail/src/freemail/Freemail.java
Log:
More checking - maybe fix #629. Correct a usage message.


Modified: trunk/apps/Freemail/src/freemail/AccountManager.java
===================================================================
--- trunk/apps/Freemail/src/freemail/AccountManager.java        2006-08-07 
18:58:55 UTC (rev 9950)
+++ trunk/apps/Freemail/src/freemail/AccountManager.java        2006-08-07 
19:36:08 UTC (rev 9951)
@@ -96,9 +96,10 @@
        }

        public static PropsFile getAccountFile(File accdir) {
+               System.out.println("==="+accdir);
                PropsFile accfile = new PropsFile(new File(accdir, 
ACCOUNT_FILE));

-               if (!accfile.exists()) {
+               if (accdir.exists() && !accfile.exists()) {
                        initAccFile(accfile);
                }


Modified: trunk/apps/Freemail/src/freemail/Freemail.java
===================================================================
--- trunk/apps/Freemail/src/freemail/Freemail.java      2006-08-07 18:58:55 UTC 
(rev 9950)
+++ trunk/apps/Freemail/src/freemail/Freemail.java      2006-08-07 19:36:08 UTC 
(rev 9951)
@@ -67,7 +67,7 @@
                                action = args[i];
                                i = i + 2;
                                if (args.length - 1 < i) {
-                                       System.out.println("Usage: 
--shortaddress <name>");
+                                       System.out.println("Usage: 
--shortaddress <name> <domain prefix>");
                                        return;
                                }
                                account = args[i - 1];
@@ -159,6 +159,7 @@
                for (int i = 0; i < files.length; i++) {
                        if (files[i].getName().equals(".") || 
files[i].getName().equals(".."))
                                continue;
+                       if (!files[i].isDirectory()) continue;

                        Thread t = new Thread(new 
SingleAccountWatcher(files[i]), "Account Watcher for "+files[i].getName());
                        t.setDaemon(true);