diff -uprk.orig cvs-1.11.14.orig/src/filesubr.c cvs-1.11.14/src/filesubr.c
--- cvs-1.11.14.orig/src/filesubr.c	2004-02-26 00:40:19 +0300
+++ cvs-1.11.14/src/filesubr.c	2004-03-20 19:08:14 +0300
@@ -494,8 +494,7 @@ deep_remove_dir (path)
 		 */
 		return -1;
 
-	    errno = 0;
-	    while ((dp = CVS_READDIR (dirp)) != NULL)
+	    while ((errno = 0, dp = CVS_READDIR (dirp)) != NULL)
 	    {
 		char *buf;
 
@@ -528,8 +527,6 @@ deep_remove_dir (path)
 		    }
 		}
 		free (buf);
-
-		errno = 0;
 	    }
 	    if (errno != 0)
 	    {
diff -uprk.orig cvs-1.11.14.orig/src/find_names.c cvs-1.11.14/src/find_names.c
--- cvs-1.11.14.orig/src/find_names.c	2004-02-20 23:36:59 +0300
+++ cvs-1.11.14/src/find_names.c	2004-03-20 19:08:14 +0300
@@ -265,8 +265,7 @@ find_rcs (dir, list)
 	return (1);
 
     /* read the dir, grabbing the ,v files */
-    errno = 0;
-    while ((dp = CVS_READDIR (dirp)) != NULL)
+    while ((errno = 0, dp = CVS_READDIR (dirp)) != NULL)
     {
 	if (CVS_FNMATCH (RCSPAT, dp->d_name, 0) == 0) 
 	{
@@ -280,7 +279,6 @@ find_rcs (dir, list)
 	    if (addnode (list, p) != 0)
 		freenode (p);
 	}
-	errno = 0;
     }
     if (errno != 0)
     {
@@ -328,42 +326,41 @@ find_dirs (dir, list, checkadm, entries)
 	return (1);
 
     /* read the dir, grabbing sub-dirs */
-    errno = 0;
-    while ((dp = CVS_READDIR (dirp)) != NULL)
+    while ((errno = 0, dp = CVS_READDIR (dirp)) != NULL)
     {
 	if (strcmp (dp->d_name, ".") == 0 ||
 	    strcmp (dp->d_name, "..") == 0 ||
 	    strcmp (dp->d_name, CVSATTIC) == 0 ||
 	    strcmp (dp->d_name, CVSLCK) == 0 ||
 	    strcmp (dp->d_name, CVSREP) == 0)
-	    goto do_it_again;
+	    continue;
 
 	/* findnode() is going to be significantly faster than stat()
 	   because it involves no system calls.  That is why we bother
 	   with the entries argument, and why we check this first.  */
 	if (entries != NULL && findnode (entries, dp->d_name) != NULL)
-	    goto do_it_again;
+	    continue;
 
 	if (skip_emptydir
 	    && strcmp (dp->d_name, CVSNULLREPOS) == 0)
-	    goto do_it_again;
+	    continue;
 
 #ifdef DT_DIR
 	if (dp->d_type != DT_DIR) 
 	{
 	    if (dp->d_type != DT_UNKNOWN && dp->d_type != DT_LNK)
-		goto do_it_again;
+		continue;
 #endif
 	    /* don't bother stating ,v files */
 	    if (CVS_FNMATCH (RCSPAT, dp->d_name, 0) == 0)
-		goto do_it_again;
+		continue;
 
 	    expand_string (&tmp,
 			   &tmp_size,
 			   strlen (dir) + strlen (dp->d_name) + 10);
 	    sprintf (tmp, "%s/%s", dir, dp->d_name);
 	    if (!isdir (tmp))
-		goto do_it_again;
+		continue;
 
 #ifdef DT_DIR
 	}
@@ -378,12 +375,12 @@ find_dirs (dir, list, checkadm, entries)
 	    {
 		/* we're either unknown or a symlink at this point */
 		if (dp->d_type == DT_LNK)
-		    goto do_it_again;
+		    continue;
 #endif
 		/* Note that we only get here if we already set tmp
 		   above.  */
 		if (islink (tmp))
-		    goto do_it_again;
+		    continue;
 #ifdef DT_DIR
 	    }
 #endif
@@ -395,7 +392,7 @@ find_dirs (dir, list, checkadm, entries)
 			    + sizeof (CVSADM) + 10));
 	    (void) sprintf (tmp, "%s/%s/%s", dir, dp->d_name, CVSADM);
 	    if (!isdir (tmp))
-		goto do_it_again;
+		continue;
 	}
 
 	/* put it in the list */
@@ -404,9 +401,6 @@ find_dirs (dir, list, checkadm, entries)
 	p->key = xstrdup (dp->d_name);
 	if (addnode (list, p) != 0)
 	    freenode (p);
-
-    do_it_again:
-	errno = 0;
     }
     if (errno != 0)
     {
diff -uprk.orig cvs-1.11.14.orig/src/import.c cvs-1.11.14/src/import.c
--- cvs-1.11.14.orig/src/import.c	2004-03-04 03:28:09 +0300
+++ cvs-1.11.14/src/import.c	2004-03-20 19:08:14 +0300
@@ -442,22 +442,21 @@ import_descend (message, vtag, targc, ta
     }
     else
     {
-	errno = 0;
-	while ((dp = CVS_READDIR (dirp)) != NULL)
+	while ((errno = 0, dp = CVS_READDIR (dirp)) != NULL)
 	{
 	    if (strcmp (dp->d_name, ".") == 0 || strcmp (dp->d_name, "..") == 0)
-		goto one_more_time_boys;
+		continue;
 #ifdef SERVER_SUPPORT
 	    /* CVS directories are created in the temp directory by
 	       server.c because it doesn't special-case import.  So
 	       don't print a message about them, regardless of -I!.  */
 	    if (server_active && strcmp (dp->d_name, CVSADM) == 0)
-		goto one_more_time_boys;
+		continue;
 #endif
 	    if (ign_name (dp->d_name))
 	    {
 		add_log ('I', dp->d_name);
-		goto one_more_time_boys;
+		continue;
 	    }
 
 	    if (
@@ -506,8 +505,6 @@ import_descend (message, vtag, targc, ta
 		    err += process_import_file (message, dp->d_name,
 						vtag, targc, targv);
 	    }
-	one_more_time_boys:
-	    errno = 0;
 	}
 	if (errno != 0)
 	{
diff -uprk.orig cvs-1.11.14.orig/src/lock.c cvs-1.11.14/src/lock.c
--- cvs-1.11.14.orig/src/lock.c	2004-02-20 23:36:59 +0300
+++ cvs-1.11.14/src/lock.c	2004-03-20 19:08:14 +0300
@@ -652,8 +652,7 @@ readers_exist (repository)
 	    error (1, 0, "cannot open directory %s", lockdir);
 
 	ret = 0;
-	errno = 0;
-	while ((dp = CVS_READDIR (dirp)) != NULL)
+	while ((errno = 0, dp = CVS_READDIR (dirp)) != NULL)
 	{
 	    if (CVS_FNMATCH (CVSRFLPAT, dp->d_name, 0) == 0)
 	    {
@@ -690,7 +689,6 @@ readers_exist (repository)
 		ret = 1;
 		break;
 	    }
-	    errno = 0;
 	}
 	if (errno != 0)
 	    error (0, errno, "error reading directory %s", repository);
diff -uprk.orig cvs-1.11.14.orig/src/update.c cvs-1.11.14/src/update.c
--- cvs-1.11.14.orig/src/update.c	2004-03-03 17:20:25 +0300
+++ cvs-1.11.14/src/update.c	2004-03-20 19:08:14 +0300
@@ -1103,8 +1103,7 @@ isemptydir (dir, might_not_exist)
 	error (0, errno, "cannot open directory %s for empty check", dir);
 	return (0);
     }
-    errno = 0;
-    while ((dp = CVS_READDIR (dirp)) != NULL)
+    while ((errno = 0, dp = CVS_READDIR (dirp)) != NULL)
     {
 	if (strcmp (dp->d_name, ".") != 0
 	    && strcmp (dp->d_name, "..") != 0)
@@ -1149,7 +1148,6 @@ isemptydir (dir, might_not_exist)
 		}
 	    }
 	}
-	errno = 0;
     }
     if (errno != 0)
     {