Commit: 44e9b62c8b7673f8c9b2895b8390502ae2cea081 - ogatool (git)

oga's tools

Commit MetaInfo

• Revision: 44e9b62c8b7673f8c9b2895b8390502ae2cea081 (tree)
• Zeit: 2014-02-11 19:08:45
• Autor: oga <hyperoga@gmai...>
• Commiter: oga

Log Message

find2.c 2013/12/12 V0.13 support X68K & Linux

Ändern Zusammenfassung

• modified: Makefile.linux
• modified: find2.c

Diff

--- a/Makefile.linux
+++ b/Makefile.linux
@@ -26,7 +26,7 @@ TARGETS=$(VP)/age $(VP)/cal2 $(VP)/cgrep $(VP)/cmem $(VP)/cpkt $(VP)/cpuid   \
     $(VP)/peke2 $(VP)/peke $(VP)/perfan $(VP)/strings2 $(VP)/t64an           \
     $(VP)/tolower $(VP)/txt2vnt $(VP)/upload $(VP)/wavana $(VP)/wavcut2      \
     $(VP)/wavcut $(VP)/welcome $(VP)/whichx $(VP)/wwstat $(VP)/xalloc        \
-    $(VP)/zusa $(VP)/rand2 $(VP)/usleep
+    $(VP)/zusa $(VP)/rand2 $(VP)/usleep $(VP)/find2
 
 TARGET_X=$(VP)/qix $(VP)/xmem $(VP)/xpkt $(VP)/xpstat 
 
@@ -45,7 +45,7 @@ $(VP)/base64 : $(TOOL)/base64.c
 	${CC} $? -o $@ -O
 
 $(VP)/cal2 : $(TOOL)/cal.c
-	${CC} $? -o $@ -O
+	${CC} $? -o $@ -O -DLINUX
 
 $(VP)/cgrep : $(TOOL)/cgrep.c
 	${CC} $? -o $@ -O
@@ -100,6 +100,9 @@ $(VP)/enews : $(TOOL)/enews.c
 $(VP)/filer : $(TOOL)/filer.c
 	${CC} $? -o $@ -O -DLINUX -I/usr/include/ncursesw -L/usr/lib/arm-linux-gnueabihf -lncursesw
 
+$(VP)/find2 : $(TOOL)/find2.c
+	${CC} $? -o $@ -O -DLINUX
+
 $(VP)/galaxian : $(TOOL)/galaxian.c
 	${CC} $? -o $@ -O -DX3050RX -I/usr/include/ncursesw -L/usr/lib/arm-linux-gnueabihf -lncursesw
 

--- a/find2.c
+++ b/find2.c
@@ -2,19 +2,30 @@
  *   find2 : ファイル/ディレクトリの検索 (日本語対応版)
  *           for WIN Only
  *
- *   表示形式
- *
  *     2003/05/16 V0.10 by oga.
  *     2003/05/21 V0.11 fix find2 c:\ => c:\/xxx
  *     2009/04/04 V0.12 support -mtime
+ *     2013/12/12 V0.13 support X68K & Linux
+ *
+ *   CFLAG
+ *     Linux: -DX68K -DLINUX
+ *
+ *
  */
+#ifdef _WIN32
 #include <windows.h>
+#else  /* X68K, LINUX */
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <dirent.h>
+#endif /* X68K, LINUX */
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <errno.h>
 
 /* macros */
-#define VER "0.12"
+#define VER "0.13"
 #define	IS_DOT(str)	(!strcmp(str,".") || !strcmp(str,".."))
 
 #define dprintf		if (vf) printf
@@ -32,6 +43,163 @@ int  vf    = 0;          /* -v     */
 int  depth = 0;
 time_t cur_tt = 0;       /* current time_t  V0.12-A */
 
+#ifdef LINUX
+#define stricmp  strcasecmp
+#endif
+
+#if defined X68K || defined LINUX
+int  errno2 = 0;
+
+#define INVALID_HANDLE_VALUE  NULL
+#define MAX_PATH              PATH_MAX
+#define TRUE   1
+#define FALSE  0
+
+/* #define PDELM  "\\" */
+
+typedef int  DWORD;
+typedef int  BOOL;
+typedef char CHAR;
+
+typedef struct _DIR2 {
+	DIR  *dirp;
+	char path[MAX_PATH];
+} DIR2, *HANDLE;
+
+typedef struct _WIN32_FIND_DATA {
+	DWORD       dwFileAttributes;
+	DWORD       nFileSizeHigh;
+	DWORD       nFileSizeLow;
+	CHAR        cFileName[ MAX_PATH ];
+
+	/* FILETIME    ftCreationTime;   */
+	/* FILETIME    ftLastAccessTime; */
+	/* FILETIME    ftLastWriteTime;  */
+	/* DWORD       dwReserved0;      */
+	/* DWORD       dwReserved1;      */
+	/* CHAR        cAlternateFileName[ 16 ]; */
+} WIN32_FIND_DATA;
+
+/* available attr */
+#define FILE_ATTRIBUTE_DIRECTORY     0x00000010  /* ディレクトリ     */
+#define FILE_ATTRIBUTE_NORMAL        0x00000080  /* 通常ファイル     */
+
+/* not support attr */
+#define FILE_ATTRIBUTE_READONLY      0x00000001  /* 読み取り専用属性 */
+#define FILE_ATTRIBUTE_HIDDEN        0x00000002  /* 隠しファイル属性 */
+#define FILE_ATTRIBUTE_ARCHIVE 	     0x00000020  /* アーカイブ属性   */
+#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400  /* 関連リパースポイントがある */
+#define FILE_ATTRIBUTE_COMPRESSED    0x00000800  /* 圧縮属性。       */
+#define FILE_ATTRIBUTE_ENCRYPTED     0x00004000  /* 暗号化属性。     */
+#define FILE_ATTRIBUTE_OFFLINE       0x00001000  /* 利用可能ではない */
+
+/* FindNextFile error reason */
+#define ERROR_NO_MORE_FILES ENOENT;
+
+
+HANDLE FindFirstFile(char *path, WIN32_FIND_DATA *pwfd)
+{
+	DIR    *dirp;
+	DIR2   *dir2p;        /* DIR with path */
+	struct dirent *dp;
+	struct stat   stbuf;
+	char   path2[MAX_PATH];
+
+	/* delete wild card */
+	strcpy(path2, path);
+	if (path2[strlen(path2)-1] == '*') {
+		path2[strlen(path2)-1] = '\0';
+	}
+	if (path2[strlen(path2)-1] == '/') {
+		if (strlen(path2) >= 2 && path2[strlen(path2)-2] == ':') {
+			/* if "a:/" ... don't delete "/" */
+		} else {
+			/* delete "/" */
+			path2[strlen(path2)-1] = '\0';
+		}
+	}
+
+	memset(pwfd, 0, sizeof(WIN32_FIND_DATA));
+
+	if (vf) printf("opendir = [%s]\n", path2);
+	dirp = opendir(path2);
+	if (!dirp) {
+		errno2 = errno;
+		perror("opendir");
+		printf("path = [%s]\n", path);
+		return INVALID_HANDLE_VALUE;
+	}
+
+	dir2p = (DIR2 *)malloc(sizeof(DIR2));
+	if (dir2p == NULL) {
+		errno2 = errno;
+		perror("malloc");
+		return INVALID_HANDLE_VALUE;
+	}
+
+	dir2p->dirp = dirp;
+	strcpy(dir2p->path, path2);
+
+	if (FindNextFile(dir2p, pwfd) == FALSE) {
+		/* EOF or Error */
+		return dir2p;
+	}
+	return dir2p;
+}
+
+BOOL FindNextFile(HANDLE dir2p, WIN32_FIND_DATA *pwfd)
+{
+	struct dirent *dp;
+	struct stat   stbuf;
+	char   wkpath[MAX_PATH];
+
+	if (vf) printf("FindNextFile: start readdir(%s)\n", dir2p->path);  /* debug */
+
+	memset(pwfd, 0, sizeof(WIN32_FIND_DATA));
+
+	if (vf) printf("FindNextFile: ----\n");  /* debug */
+
+	dp = readdir(dir2p->dirp);
+	if (!dp) {
+		/* end of entry */
+		errno2 = ERROR_NO_MORE_FILES;
+		return FALSE;
+	}
+	strcpy(pwfd->cFileName, dp->d_name);
+	strcpy(wkpath, dir2p->path);
+	strcat(wkpath, "/");
+	strcat(wkpath, dp->d_name);
+	if (vf) printf("FindNextFile: start stat(%s)\n", wkpath);  /* debug */
+	if (stat(wkpath, &stbuf) == 0) {
+		if (stbuf.st_mode & S_IFDIR) {
+			pwfd->dwFileAttributes |= FILE_ATTRIBUTE_DIRECTORY;
+			if (vf >= 2) printf("# %s is dir. 0x%08x\n", wkpath, pwfd->dwFileAttributes);
+		} else {
+			/* とりあえずディレクトリ以外はNORMALにたおす */
+			pwfd->dwFileAttributes |= FILE_ATTRIBUTE_NORMAL;
+			if (vf >= 2) printf("# %s is file. 0x%08x\n", wkpath, pwfd->dwFileAttributes);
+		}
+		pwfd->nFileSizeHigh = 0;
+		pwfd->nFileSizeLow  = stbuf.st_size;
+	}
+	return TRUE;
+}
+
+BOOL FindClose(HANDLE dir2p)
+{
+	closedir(dir2p->dirp);   /* void */
+	free(dir2p);
+
+	return TRUE;
+}
+
+int GetLastError()
+{
+	return errno2;
+}
+
+#endif /* X68K || LINUX */
+
 void Usage()
 {
     printf("find Verson %s  by oga.\n",VER);
@@ -40,7 +208,7 @@ void Usage()
     printf("    -type {d|f}   : dir or file only\n");
     printf("    -name <name>  : name match (ignore case)\n");
     printf("    -mtime <n>    : file's data was last modified n*24 hours ago.\n");
-    //printf("    -mmin <n>     : file's data was last modified n*24 hours ago.\n");
+    /*printf("    -mmin <n>     : file's data was last modified n*24 hours ago.\n"); */
 }
 
 /*
@@ -95,6 +263,7 @@ void Find(char *path)
     char   *pt;
     
     depth++;
+    if (vf) printf("[%d]Find start.\n", depth);  /* debug */
 
     /* ディレクトリ表示 */
     if ((ftype & F_TYPE_FILE) == 0) {
@@ -201,6 +370,7 @@ void Find(char *path)
 	    if (strlen(wk) && wk[strlen(wk)-1] != '/') strcat(wk,"/");
             strcat(wk,wfd.cFileName);	/* make new path     */
 	    Find(wk);
+    	    if (vf) printf("[%d]Find return.\n", depth);  /* debug */
 	} else {
 	    /* ファイルの場合すぐ表示(-type d指定のない場合) */
             if ((ftype & F_TYPE_DIR) == 0) {
@@ -208,10 +378,14 @@ void Find(char *path)
 	    }
         }
     }
+    if (vf) printf("[%d]Find end.\n", depth);  /* debug */
     FindClose(fh);
+    if (vf) printf("[%d]Find end. (FindClose end)\n", depth);  /* debug */
 
     depth--;
 
+    return;
+
 } /* End Find() */
 
 int main(int a, char *b[])
@@ -272,5 +446,7 @@ int main(int a, char *b[])
     return 0;
 }
 
+/* vim:ts=8:sw=4:
+ */