Commit: 050f74886b78aa8d0f2ed65901dbfb305d65aefe - ogatool (git)

oga's tools

Commit MetaInfo

• Révision: 050f74886b78aa8d0f2ed65901dbfb305d65aefe (tree)
• l'heure: 2019-06-09 15:51:39
• Auteur: oga <hyperoga@gmai...>
• Commiter: oga

Message de Log

Merge branch 'master' of git.pf.sourceforge.jp:/gitroot/h/hy/hyperoga/ogatool

Conflicts:
cal.c

V1.92+V1.92->V1.93

Change Summary

• modified: Makefile.win_mingw
• modified: Makefile.win_vc6
• modified: cal.c
• add: netpf_send.c

Modification

--- a/Makefile.win_mingw
+++ b/Makefile.win_mingw
@@ -51,9 +51,10 @@ TARGETS = $(VP)/age.exe $(VP)/cal.exe $(VP)/cgrep.exe $(VP)/csv2nocr.exe    \
   $(VP)/midana.exe $(VP)/lanck.exe $(VP)/sysinfdsrv.exe $(VP)/findwin.exe   \
   $(VP)/getsysm.exe $(VP)/midiapi.exe $(VP)/play.exe $(VP)/sendevt.exe      \
   $(VP)/shutdown.exe $(VP)/sysperf.exe $(VP)/winmidisample.exe              \
-  $(VP)/dgclient.exe $(VP)/dgserver.exe
+  $(VP)/dgclient.exe $(VP)/dgserver.exe $(VP)/netpf.exe                     \
+  $(VP)/netpf_send.exe 
 
-TARGETS_MS = $(VP)/cpuid.exe $(VP)/ctrain.exe $(VP)/df.exe $(VP)/lsc.exe $(VP)/miscclient.exe $(VP)/miscserver.exe $(VP)/netpf.exe $(VP)/sndtimer.exe $(VP)/sysinfd.exe $(VP)/regsv.exe $(VP)/sysinfd_win.exe $(VP)/pcap_test.exe $(VP)/joytest.exe $(VP)/icmpsnd.exe $(VP)/getver.exe $(VP)/dxshow.exe $(VP)/clip.exe $(VP)/readevt.exe $(VP)/midic.exe 
+TARGETS_MS = $(VP)/cpuid.exe $(VP)/ctrain.exe $(VP)/df.exe $(VP)/lsc.exe $(VP)/miscclient.exe $(VP)/miscserver.exe $(VP)/sndtimer.exe $(VP)/sysinfd.exe $(VP)/regsv.exe $(VP)/sysinfd_win.exe $(VP)/pcap_test.exe $(VP)/joytest.exe $(VP)/icmpsnd.exe $(VP)/getver.exe $(VP)/dxshow.exe $(VP)/clip.exe $(VP)/readevt.exe $(VP)/midic.exe 
 
 all: $(TARGETS)
 
@@ -210,6 +211,9 @@ $(VP)/mkindex.exe : mkindex.c
 $(VP)/netpf.exe : netpf.c
 	$(CC) $? $(NOLOGO) -o $@ -DDOS
 
+$(VP)/netpf_send.exe : netpf_send.c
+	$(CC) $? $(NOLOGO) -o $@ -DDOS
+
 $(VP)/othello2.exe : othello2.c
 	$(CC) $? $(NOLOGO) -o $@
 

--- a/Makefile.win_vc6
+++ b/Makefile.win_vc6
@@ -19,8 +19,10 @@ CPP    = cl
 NOLOGO = -nologo
 OOPT   = /O2
 MTOPT  = /MT
-PSDKLIB=C:\MSPlatformSDK\Lib
-PSDKINC=C:\MSPlatformSDK\Include
+#PSDKLIB=C:\MSPlatformSDK\Lib
+#PSDKINC=C:\MSPlatformSDK\Include
+PSDKLIB=C:\MSPSDK\Lib
+PSDKINC=C:\MSPSDK\Include
 DXSDKINC=C:\DirectXSDK_June2010\Include
 
 #XLIB = -L/usr/X11R6/lib

--- a/cal.c
+++ b/cal.c
@@ -18,7 +18,8 @@
  *                         2014.02.11  V1.86 support NT cmmand prompt
  *                         2014.11.03  V1.90 support variable holiday
  *                         2014.11.03  V1.91 fix NT usage color
- *                         2019.06.09  V1.92 append new birthday of tennou (2/23)
+ *                         2015.04.13  V1.92 fix continuation substitute holiday, add -holidump
+ *                         2019.06.09  V1.93 append new birthday of tennou (2/23)
  *
  *  X68000 : default
  *  HI-UX  : -DX_H3050R -D_HIUX_SOURCE
@@ -53,7 +54,7 @@
 #include <time.h>
 #endif
 
-#define VER 	"1.92"
+#define VER 	"1.93"
 #define MAX_ENT 2000
 
 #ifdef DOS
@@ -75,6 +76,7 @@ void add_holiday();           /* V1.90-A */
 void adjust_holiday();        /* V1.90-A */
 void backup_color();          /* V1.91-A */
 void restore_color();         /* V1.91-A */
+void dump_holiday();          /* V1.92-A */
 
 #if defined(X_H3050R) || defined(DOS) || defined(LINUX)
 int _iocs_bindateget();
@@ -108,6 +110,8 @@ int holi[MAX_ENT*3];                /* holiday table V1.90-C */
  *    月,日,適用開始年,適用終了年,第n,曜日(1:月曜)
  *
  *    (注)国民の祝日の制定は1948/7/20施行
+ *        固定休日は第n, 曜日は0,0
+ *        複雑な計算の春分の日、秋分の日はadjust_holiday()内で設定 
  */
 holidat_t new_holi[] = {
 	1,   1, 1949, 9999, 0, 0,   /* 元日         固定(1949-)               */
@@ -116,9 +120,9 @@ holidat_t new_holi[] = {
 	1,  15, 2000, 9999, 2, 1,   /* 成人の日     2000年からHappyMonday適用 */
 
 	2,  11, 1967, 9999, 0, 0,   /* 建国記念の日 固定(1967-)               */
-	2,  23, 2020, 9999, 0, 0,   /* 天皇誕生日3  固定(2020-) 令和          */
+	2,  23, 2020, 9999, 0, 0,   /* 天皇誕生日3  固定(2020-) 令和  V1.93-A */
 
-	/* 天皇誕生日1(1949-1988), 緑の日(1989-2006) 昭和の日(2007-) */
+	/* 天皇誕生日1(1949-1988), 緑の日(1989-2006) 昭和の日(2007-)          */
 	4,  29, 1949, 9999, 0, 0,   /* 昭和の日     固定(1949-)               */
 
 	5,   3, 1949, 9999, 0, 0,   /* 憲法記念日   固定(1949-)               */
@@ -142,7 +146,7 @@ holidat_t new_holi[] = {
 
 	11, 23, 1948, 9999, 0, 0,   /* 勤労感謝の日 固定(1948-)               */
 
-	12, 23, 1989, 2018, 0, 0    /* 天皇誕生日2  固定(1989-2018) 平成      */
+	12, 23, 1989, 2018, 0, 0    /* 天皇誕生日2  固定(1989-2018) 平成 V1.93-C */
 };
 /* V1.90-A end */
 
@@ -186,6 +190,8 @@ char *b[];
 {
 	int  year = 0, month = 0, cur_flg = 0;
 	int  xdate;
+	int  hdf   = 0;   /* holiday dump (secret opt)  V1.92-A */
+	int  shift = 0;   /* shift arg                  V1.92-A */
 	char *dt=(char *)&xdate;
 
 	backup_color();   /* for dos V1.91-A */
@@ -195,6 +201,13 @@ char *b[];
 		exit(1);
 	}
 
+	/* V1.92-A start */
+	if (a > 1 && strcmp(b[1],"-holidump") == 0) {
+		/* usage: cal -holidump [[month] year] */
+		hdf = 1;
+	}
+	/* V1.92-A end   */
+
 #ifdef X_H3050R
 	if (getenv("COLORCAL") != 0) {	/* for 3050RX */
 		blue   = "";
@@ -210,6 +223,14 @@ char *b[];
 	}
 
     	xdate = _iocs_bindateget();                   /* get date             */
+
+	/* V1.92-A start */
+	if (hdf) {
+		--a;                                  /* shift argc */
+		shift = 1;                            /* shift pos  */
+	}
+	/* V1.92-A start */
+
 	switch (a) {
 		case 1: 
 			year    = bcd2bin(dt[1])+1980;        /* day:year:month:date  */
@@ -217,11 +238,11 @@ char *b[];
 			cur_flg = 1;                          /* today's year & month */
 			break;
 		case 2: 
-			year  = atoi(b[1]);
+			year  = atoi(b[1+shift]);
 			break;
 		case 3: 
-			month = atoi(b[1]);
-			year  = atoi(b[2]);
+			month = atoi(b[1+shift]);
+			year  = atoi(b[2+shift]);
 	 		break;
 	}
 	if (year < 1) {
@@ -238,6 +259,14 @@ char *b[];
 	memset(holi, 0, sizeof(holi));                  /* V1.90-A */
 
 	adjust_holiday(year);         /* adjust holiday    V1.90-A */
+
+	/* V1.92-A start */
+	if (hdf) {
+		dump_holiday(year);   /* dump holiday              */
+		return 0;
+	}
+	/* V1.92-A end   */
+
 	get_holiday();                /* read holiday file V1.90-M */
 
 	if (month == 0) {
@@ -247,8 +276,33 @@ char *b[];
 	}
 
 	restore_color();  /* V1.91-C */
+
+	return 0;         /* V1.92-A */
 }
 
+/* V1.92-A start */
+/* 
+ *  dump holiday table 
+ *    note: call after adjust_holiday()
+ * 
+ */
+void dump_holiday(yy)
+int yy;
+{
+	int i = 0;
+
+	printf("Year %d's holiday\n", yy);
+
+	/* search holiday */
+	while (holi[i*3+2]) {
+		printf("%4d/%2d/%2d\n", yy, holi[i*3+1], holi[i*3+2]);
+		++i;
+	}
+
+}
+/* V1.92-A end   */
+
+
 /* V1.90-A start */
 /* 
  *  add to holiday table 
@@ -441,7 +495,8 @@ int year;
 			wk = d[l*7+j][i*6+k];
 			you = j;
 			if (chk_holiday(year,month,wk)>0 || furikae > 0) {
-			    if (furikae > 0) {
+			    /* if (furikae > 0)  V1.92-D */
+			    if (!chk_holiday(year,month,wk) && furikae > 0) { /* V1.92-C */
 				furikae--;
 			    }
 			    you = 0;				/* 休日   */
@@ -514,8 +569,10 @@ int year,month,cur_flg,day;
 			wk = d[((month-1)%3)*7+j][((month-1)/3)*6+k];
 			you = j;
 			if (chk_holiday(year,month,wk) || furikae > 0) {
-				if (furikae > 0)
+				/* if (furikae > 0)  V1.92-D */
+				if (!chk_holiday(year,month,wk) && furikae > 0) { /* V1.92-C */
 					furikae--;
+				}
 				you = 0;			/* 休日(黄色) */
 				if (j == 0) {
 					furikae = 1;
@@ -583,7 +640,7 @@ int year;
 		   (year % 100 != 0 || year % 400 == 0) ) {
 			r = 365*(year-1) + m2[month-1] ;  /* うるう年  */
 			m0=m2[month]-m2[month-1];         /* 月の最後の日 */
-			holi[14] = 20;	  	/* V1.8   春分の日:3/20 */
+			/* holi[14] = 20;  V1.92-D */     /* V1.8   春分の日:3/20 */
 		} else {
 			r = 365*(year-1) + m1[month-1];
 			m0=m1[month]-m1[month-1];         /* 月の最後の日 */

--- /dev/null
+++ b/netpf_send.c
@@ -0,0 +1,481 @@
+/*
+ *  netpf_send.c
+ *
+ *     network性能測定 (send only.)
+ *
+ *     98/04/22 V1.00 by oga.
+ *     99/08/20 V1.01 add verbose mode
+ *     01/02/17 V1.011 GetSystemTime => GetLocalTime
+ *     03/06/07 V1.02 diff 0 対策
+ *     -------------------------------
+ *     16/01/14 V1.03 netpf.c => netpf_send.c
+ *     16/01/19 V1.04 add shutdown for win 10054 error
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#ifdef DOS
+#include <windows.h>
+#include <winsock.h>
+#else /* DOS */
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <fcntl.h>
+#include <signal.h>
+#endif /* DOS */
+
+#define VER         "1.04"
+#define LOOP        3
+#define dprintf
+#define	SEND_SIZE   (1024*1024*10)   /* default: 10MB */
+
+#ifndef SHUT_RDWR
+#define SHUT_RDWR	SD_BOTH
+#endif
+
+#ifndef SD_BOTH
+#define SD_BOTH     0x02
+#endif
+
+void PUT_DATA(int, char *, int);
+void GET_DATA(int, char *, int);
+void reapchild();
+void memdump(FILE *, unsigned char *, int);
+
+int	 send_size = SEND_SIZE;        /* default: 10MB */
+int	 vf        = 0;                /* verbose      */
+
+#ifdef DOS
+/*
+struct timeval {
+	u_int tv_sec;
+	u_int tv_usec;
+};
+*/
+
+int gettimeofday(struct timeval *tv, void *tz);
+#endif
+
+main(a,b)
+int a;
+char *b[];
+{
+	int 	sockfd, newsockfd, clilen, childpid;
+	struct 	sockaddr_in cli_addr, serv_addr;
+        struct  hostent *hostp;
+	int 	fd;
+	int	con = 0;
+	int	port = 22122;
+	int	sz, i;
+	int     svf = 0;	/* for client process */
+	char	*buf;
+	char	hostn[256];
+#ifdef DOS
+	char	msg[256];
+	WSADATA  WsaData;
+#endif
+
+	for (i = 1; i<a; i++) {
+	    if (!strncmp(b[i],"-h",2)) {
+		printf("netpf_send ver%s\n", VER);
+		printf("usage : netpf_send { -s | <hostname> } [-p <port(%d)>] [-c <send_size(MB)>\n", port);
+		printf("          -s        : start as netpf server\n");
+		printf("          hostnames : netpf server name.(start as netpf client)\n");
+		printf("          -c size   : test data size(MB) default:%dMB\n", SEND_SIZE/1024/1024);
+		printf("          -p port   : test port\n");
+		exit(1);
+	    }
+	    if (!strncmp(b[i],"-s",2)) {
+		svf = 1;
+		continue;
+	    }
+	    if (!strncmp(b[i],"-p",2)) {
+		port = atoi(b[++i]);
+		printf("port = %d\n",port);
+		continue;
+	    }
+	    if (!strncmp(b[i],"-c",2)) {
+		send_size = atoi(b[++i])*1024*1024;
+		continue;
+	    }
+	    if (!strncmp(b[i],"-v",2)) {
+	        vf = 1;
+		continue;
+	    }
+	    strcpy(hostn,b[i]);
+	}
+
+	if (!(buf = (char *)malloc(send_size))) {
+	    printf("malloc error. errno=%d\n",errno);
+	    exit(1);
+	}
+
+	memset((char *)&serv_addr, 0, sizeof(serv_addr));
+
+#ifdef DOS
+	if (WSAStartup(0x0101, &WsaData)) {
+	    sprintf(msg,"WSAStartup Error : %d",WSAGetLastError());
+	    printf(msg);
+	    return -1;
+	}
+#endif
+
+	if (svf) {
+
+            /* 
+             *   netpf server 
+             */
+	    printf("wait for port %d\n",port);
+
+	    if( (sockfd=socket(AF_INET, SOCK_STREAM, 0)) < 0 ){
+		perror("socket");
+#ifdef DOS
+		WSACleanup();
+#endif
+		exit(-1);
+	    } 
+
+	    serv_addr.sin_family      = AF_INET;
+	    serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+	    serv_addr.sin_port        = htons((short)port);
+
+	    if(bind(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0){
+		perror("bind");
+#ifdef DOS
+		WSACleanup();
+#endif
+		exit(-1);
+	    } 
+
+#ifndef DOS
+	    signal(SIGCLD, reapchild);
+#endif
+
+	    printf("listen...\n");
+	    if(listen(sockfd, 5) < 0){
+		perror("listen");
+#ifdef DOS
+		WSACleanup();
+#endif
+		exit(-1);
+	    }
+
+	    while (1) {
+	        clilen = sizeof(cli_addr);
+	        newsockfd = accept(sockfd, (struct sockaddr *)&cli_addr,
+				&clilen);
+	        if(newsockfd < 0){
+	            if (errno == EINTR) {
+	                printf("accept interrupted\n");
+	                continue;
+	            }
+		    perror("accept");
+#ifdef DOS
+		WSACleanup();
+#endif
+		    exit(-1);
+	        }
+	
+#ifndef DOS
+	        if (fork() == 0) {
+	            /* child */
+#endif
+	            close(sockfd);
+	            printf("accept %d pid=%d\n",con,getpid());
+	            /* サーバ処理 */
+	            for (i = 0; i<LOOP; i++) {
+	                printf("## recv %d MB start\n",send_size/1024/1024);
+	                GET_DATA(newsockfd, buf, send_size);
+	                //printf("## send %d KB start\n",send_size/1024);
+	                //PUT_DATA(newsockfd, buf, send_size);
+	            }
+		    printf("chile pid=%d exit!\n",getpid());
+		    if (shutdown(newsockfd, SHUT_RDWR) < 0) {
+#ifdef DOS
+        		printf("send: errno=%d  LastErr=%d\n", errno, WSAGetLastError());
+#else
+        		printf("send: errno=%d\n", errno);
+#endif
+		    }
+	            close(newsockfd);
+#ifndef DOS
+	            exit(0);
+	        } 
+#endif
+	        close(newsockfd);
+	        con++;
+            }
+        } else {
+
+            /* 
+             *   netpf client 
+             */
+
+	    hostp = gethostbyname(hostn);
+	    if (!hostp) {
+	        printf("Error: gethostbyname(%s) error \n",hostn);
+	        return 1;
+	    }
+
+	    serv_addr.sin_family      = AF_INET;
+#if 1
+	    serv_addr.sin_addr.s_addr = *(int *)hostp->h_addr;
+#else
+	    memcpy((char *)&serv_addr.sin_addr.s_addr, 
+	    			(char *)hostp->h_addr, 
+	    			sizeof(serv_addr.sin_addr.s_addr));
+#endif
+	    serv_addr.sin_port	      = htons((short)port);
+
+	    if (vf) {
+	        printf("DEBUG: host(%s) IP(%s)\n", hostn, 
+		                  inet_ntoa(serv_addr.sin_addr));
+	    }
+
+	    if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0){
+		perror("socket");
+#ifdef DOS
+		WSACleanup();
+#endif
+		exit(-1);
+	    }
+
+	    if (connect(sockfd, (struct sockaddr *)&serv_addr, 
+					sizeof(serv_addr)) < 0){ 
+		perror("connect");
+#ifdef DOS
+                printf("connect: winerr=%d\n", WSAGetLastError());
+		WSACleanup();
+#endif
+		exit(-1);
+	    }
+            for (i = 0; i<LOOP; i++) {
+                printf("## send %d MB start\n",send_size/1024/1024);
+                PUT_DATA(sockfd, buf, send_size);
+                //printf("## recv %d MB start\n",send_size/1024/1024);
+                //GET_DATA(sockfd, buf, send_size);
+            }
+	    if (shutdown(sockfd, SHUT_RDWR) < 0) {
+#ifdef DOS
+       		printf("send: errno=%d  LastErr=%d\n", errno, WSAGetLastError());
+#else
+       		printf("send: errno=%d\n", errno);
+#endif
+	    }
+            close(sockfd);
+
+        }
+#ifdef DOS
+	WSACleanup();
+#endif
+        return 0;
+}
+
+void PUT_DATA(int sockfd, char *buf, int sz)
+{
+	int size, all=0;
+	struct timeval tv, tv2;
+	unsigned int wk,wk2,diff;
+	int cnt = 0;
+
+	gettimeofday(&tv,0);
+	wk = tv.tv_sec*1000000 + tv.tv_usec;
+	dprintf("Send start usec : %u\n",wk);
+
+	do {
+		++cnt;
+	    size = send(sockfd, buf, sz-all, 0);
+	    if (size < 0) {
+#ifdef DOS
+	        printf("send: errno=%d  LastErr=%d\n", errno, WSAGetLastError());
+#else
+	        printf("send: errno=%d\n", errno);
+#endif
+		exit(1);
+	    }
+	    all += size;
+	} while (all < sz);
+
+	if (vf) {
+		printf("num of send = %d\n", cnt);
+	}
+
+	gettimeofday(&tv,0);
+	wk2 = tv.tv_sec*1000000 + tv.tv_usec;
+	diff = wk2-wk;
+	if (diff <0 ) diff = -diff;
+	dprintf("Send   end usec : %u\n",wk2);
+	dprintf("      diff usec : %u\n",diff);
+	printf("Send Size = %d  time = %.3fsec  perf = %.3fMB/sec\n",
+			all,
+			(float)diff/1000000,
+			(diff/1000 == 0)?999999:(float)all/diff); /* V1.02-C */
+}
+
+/* 
+ *   get socket data and write to file
+ *
+ *   IN : fd     : 入力ファイル
+ *        sockfd : 入力ソケットディスクリプタ
+ *        sz     : 確実に読みとるサイズ
+ */
+void GET_DATA(int sockfd, char *buf, int sz)
+{
+	int size, all=0;
+	struct timeval tv, tv2;
+	unsigned int wk,wk2,diff;
+	int cnt = 0;
+
+	gettimeofday(&tv,0);
+	wk = tv.tv_sec*1000000 + tv.tv_usec;
+	dprintf("Recv start usec : %u\n",wk);
+
+	do {
+		++cnt;
+	    size = recv(sockfd, buf, sz-all, 0);
+	    if (size < 0) {
+#ifdef DOS
+	        printf("recv: errno=%d  LastErr=%d\n", errno, WSAGetLastError());
+#else
+	        printf("recv: errno=%d\n", errno);
+#endif
+		exit(1);
+	    }
+	    all += size;
+	} while (all < sz);
+
+	if (vf) {
+		printf("num of recv = %d\n", cnt);
+	}
+
+	gettimeofday(&tv,0);
+	wk2 = tv.tv_sec*1000000 + tv.tv_usec;
+	diff = wk2-wk;
+	if (diff <0 ) diff = -diff;
+	dprintf("Recv   end usec : %u\n",wk2);
+	dprintf("      diff usec : %u\n",diff);
+	printf("Recv Size = %d  time = %.3fsec  perf = %.3fMB/sec\n",
+			all,
+			(float)diff/1000000,
+			(float)all/diff);
+}
+
+void reapchild()
+{
+#ifndef DOS
+	wait(0);
+	signal(SIGCLD,reapchild);
+#endif
+}
+
+/*
+ *  void memdump(fp, buf, size)
+ *
+ *  bufから、size分を fp にヘキサ形式で出力する
+ *
+ *  <出力例>
+ *  Location: +0       +4       +8       +C       /0123456789ABCDEF
+ *  00000000: 2f2a0a20 2a205265 76697369 6f6e312e //#. # Revision1.
+ *  00000010: 31203936 2e30372e 30312074 616b6173 /1 96.07.01 takas
+ *  00000020: 6869206b 61696e75 6d610a20 2a2f0a2f /hi kainuma. #/./
+ *
+ *  IN  fp   : 出力ファイルポインタ (標準出力の場合はstdoutを指定)
+ *      buf  : ダンプメモリ先頭アドレス
+ *      size : ダンプサイズ
+ *
+ */
+void memdump(fp, buf, size)
+FILE *fp;
+unsigned char *buf;
+int  size;
+{
+	int c, xx, addr = 0, i;
+	int f=0, f2=0;
+	int kflag = 0;		/* 漢字出力 */
+	int pos   = 0;
+	char asc[17];
+	
+	/* ヘッダ出力 */
+	fprintf(fp,
+	  "Location: +0       +4       +8       +C       /0123456789ABCDEF\n");
+
+	c = buf[pos++];   /* c = getc(infp); */
+	while(pos <= size) {
+	    xx = 0;
+	    strcpy(asc,"                ");
+	    fprintf(fp,"%08x: ",addr);
+	    f = 0;
+	    while(pos <= size && xx < 16) {
+		fprintf(fp,"%02x",c);
+		if (c < 32) {
+		    if (f) {
+			asc[xx] = c;
+			if (c == 10 || c == 13) {
+			    asc[xx] = '.'; /* 暫定 */
+			}
+		    } else {
+			asc[xx] = '.';
+		    }
+		    f = 0;
+		} else if (c > 127 ) {
+		    if (kflag) {
+		        if (f) {
+			    asc[xx] = c;
+			    f = 0;
+			} else {
+			    asc[xx] = c;
+			    f = 1;
+			}
+		    } else {
+			asc[xx] = '.';
+		    }
+		} else {
+		    asc[xx] = c;
+		    f = 0;
+		}
+		if (xx == 0 && f2) {
+		    asc[xx] = '.';
+		    f = 0;
+		    f2 = 0;
+		}
+		if ((xx % 4) == 3) fprintf(fp," ");
+		++xx;
+		++addr;
+		c = buf[pos++];   /* c = getc(infp); */
+		if (f == 1 && xx >= 16) {
+		    asc[xx++] = c;
+		    f = 0;
+		    f2 = 1;
+		}
+	    }
+	    while (xx <16) {
+		fprintf(fp,"  ");
+		if ((xx % 4) == 3) fprintf(fp," ");
+		++xx;
+	    }
+	    asc[xx]='\0';
+	    fprintf(fp,"/%16s \n",asc);
+	}
+}
+
+#ifdef DOS
+int gettimeofday(struct timeval *tv, void *tz)
+{
+    	SYSTEMTIME syst;
+
+        //GetSystemTime(&syst);   // UTC
+	GetLocalTime(&syst);
+	tv->tv_sec  = syst.wHour * 3600 +
+       		      syst.wMinute *60 +
+        	      syst.wSecond;
+	tv->tv_usec = syst.wMilliseconds * 1000;
+	return 0;
+}
+#endif /* DOS */