提交: 178e8b7d547b5ae69023f32c464fbef6e74ceb61 - ogatool (git)

oga's tools

Commit MetaInfo

• 修订版: 178e8b7d547b5ae69023f32c464fbef6e74ceb61 (tree)
• 时间: 2019-09-23 08:36:23
• 作者: oga <hyperoga@gmai...>
• Commiter: oga

Log Message

DU V1.15 skip access denied error

更改概述

• modified: du.c

差异

--- a/du.c
+++ b/du.c
@@ -10,6 +10,8 @@
  *            02/10/02 V1.12 -d (depth) support
  *            05/08/31 V1.13 support large size dir
  *            08/06/15 V1.14 support over 4gb file
+ *            19/09/23 V1.15 skip access denied error, and expand size format
+ *
  */
 #include <windows.h>
 #include <stdio.h>
@@ -18,7 +20,7 @@
 #include <sys/types.h>
 
 /* macros */
-#define VER "1.14"
+#define VER "1.15"
 #define	IS_DOT(str)	(!strcmp(str,".") || !strcmp(str,".."))
 
 #define dprintf		if (vf) printf
@@ -262,7 +264,13 @@ void Du(char *path)
     
     fh = FindFirstFile(wk,&wfd);
     if (fh == INVALID_HANDLE_VALUE) {
-        printf("du: FindFirstFile(%s) Error code=%d\n",wk,GetLastError());
+	int lastst;
+	lastst = GetLastError();
+	/* V1.15-C start */
+        if (vf >= 2 || lastst != ERROR_ACCESS_DENIED) {
+	    printf("du: FindFirstFile(%s) Error code=%d\n",wk,lastst);
+	}
+	/* V1.15-C end   */
         /* exit(1); */
 	depth--; /* V1.11-A */
 	return;  /* V1.11-C */
@@ -334,7 +342,7 @@ void Du(char *path)
 #ifdef OLD
             printf("%7d",(totalb-tsvb)/1024);
 #else
-            printf("%7d", ans);                          /* V1.13-C */
+            printf("%9d", ans);                          /* V1.13-C V1.15-C */
 #endif
             if (af) {
 #ifdef OLD
@@ -343,7 +351,7 @@ void Du(char *path)
                 memcpy(&work64, &total64, sizeof(u_long64));     /* V1.13-A */
                 sub64(&work64, &tsv64);                          /* V1.13-A */
                 dev1024(&work64, &ans);                          /* V1.13-A */
-                printf(" (%7d)", ans);                           /* V1.13-C */
+                printf(" (%9d)", ans);                           /* V1.13-C V1.15-C */
 #endif
             }
             printf(" %s\n",path);
@@ -352,3 +360,4 @@ void Du(char *path)
 
 } /* End Du() */
 
+// vim:ts=8