Index: src/add.c
==================================================================
--- src/add.c
+++ src/add.c
@@ -7,11 +7,11 @@
 **
 ** This program is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ** General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU General Public
 ** License along with this library; if not, write to the
 ** Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ** Boston, MA  02111-1307, USA.
 **
@@ -32,18 +32,18 @@
 /*
 ** Set to true if files whose names begin with "." should be
 ** included when processing a recursive "add" command.
 */
 static int includeDotFiles = 0;
-    
+
 /*
 ** Add a single file
 */
 static void add_one_file(const char *zName, int vid, Blob *pOmit){
   Blob pathname;
   const char *zPath;
-      
+
   file_tree_name(zName, &pathname, 1);
   zPath = blob_str(&pathname);
   if( strcmp(zPath, "manifest")==0
    || strcmp(zPath, "_FOSSIL_")==0
    || strcmp(zPath, "manifest.uuid")==0
@@ -126,11 +126,11 @@
 /*
 ** COMMAND: add
 **
 ** Usage: %fossil add FILE...
 **
-** Make arrangements to add one or more files to the current checkout 
+** Make arrangements to add one or more files to the current checkout
 ** at the next commit.
 **
 ** When adding files recursively, filenames that begin with "." are
 ** excluded by default.  To include such files, add the "--dotfiles"
 ** option to the command-line.
@@ -201,13 +201,18 @@
   }
   db_begin_transaction();
   for(i=2; i<g.argc; i++){
     char *zName;
     char *zPath;
+    int isDir;
     Blob pathname;
 
     zName = mprintf("%/", g.argv[i]);
+    isDir = file_isdir(zName);
+    if( isDir==1 ){
+      fossil_fatal("cannot remove directories. Please remove individual files instead.");
+	}
     file_tree_name(zName, &pathname, 1);
     zPath = blob_str(&pathname);
     if( !db_exists(
              "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){
       fossil_fatal("not in the repository: %s", zName);
@@ -221,11 +226,11 @@
   db_multi_exec("DELETE FROM vfile WHERE deleted AND rid=0");
   db_end_transaction(0);
 }
 
 /*
-** Rename a single file.  
+** Rename a single file.
 **
 ** The original name of the file is zOrig.  The new filename is zNew.
 */
 static void mv_one_file(int vid, const char *zOrig, const char *zNew){
   printf("RENAME %s %s\n", zOrig, zNew);

Index: src/sha1.c
==================================================================
--- src/sha1.c
+++ src/sha1.c
@@ -611,11 +611,14 @@
   for(i=2; i<g.argc; i++){
     if( g.argv[i][0]=='-' && g.argv[i][1]==0 ){
       blob_read_from_channel(&in, stdin, -1);
       sha1sum_blob(&in, &cksum);
     }else{
+	  if (access(g.argv[i], R_OK)) {
+		  fossil_fatal("cannot open %s", g.argv[i]);
+	  }
       sha1sum_file(g.argv[i], &cksum);
     }
     printf("%s  %s\n", blob_str(&cksum), g.argv[i]);
     blob_reset(&cksum);
   }
 }