=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/post-msg-asirgui/cmdasir.c,v retrieving revision 1.1 retrieving revision 1.6 diff -u -p -r1.1 -r1.6 --- OpenXM_contrib2/windows/post-msg-asirgui/cmdasir.c 2013/08/27 05:51:50 1.1 +++ OpenXM_contrib2/windows/post-msg-asirgui/cmdasir.c 2013/11/27 14:59:43 1.6 @@ -1,9 +1,11 @@ -/* $OpenXM$ */ +/* $OpenXM: OpenXM_contrib2/windows/post-msg-asirgui/cmdasir.c,v 1.5 2013/11/27 04:23:07 takayama Exp $ */ // cl test.c user32.lib #include #include #include +#include +#include #include char *winname2uxname(char winname[]); @@ -11,20 +13,24 @@ FILE *findAsirHandler(); int sendFileName(HWND hnd,char uname[]); int loadFile(HWND hnd, char *uname); int terminateAsir(HWND hnd); +int hasTemp(char *s); +int pasteFile(HWND hnd, char *uname); +int containEnd(char s[]); +int abortAsir(HWND hnd); int main(int argc, char *argv[]) { HWND hnd; - int i,j,c,ii; + int c,ii; char *uname=NULL; FILE *fp=NULL; FILE *fp2=NULL; char snameWin[1024]; char *snameUx; - char *s; char msg[1024]; char cmd[1024]; int paste_contents=0; + int abort=0; /* MessageBox(NULL,TEXT("test"),TEXT("Error in cmdasir.c"),MB_OK); */ sprintf(snameWin,"%s\\cmdasir-%d.txt",getenv("TEMP"),getpid()); @@ -34,6 +40,7 @@ int main(int argc, char *argv[]) system(cmd); return(0); } + fp = findAsirHandler(); if (fp == NULL) { fprintf(stderr,"handler file is not found.\n"); return(-1); @@ -43,12 +50,15 @@ int main(int argc, char *argv[]) if ((argc > 1) && (strcmp(argv[1],"--quit")==0)) { return terminateAsir(hnd); } + if ((argc > 1) && (strcmp(argv[1],"--abort")==0)) { + return abortAsir(hnd); + } printf("Handler is %d\n",hnd); paste_contents=0; for (ii=1; ii= size-1) { @@ -205,7 +220,46 @@ int pasteFile(HWND hnd, char *uname) { } i++; } - sendFileName(hnd,s); + if (containEnd(s)) { + MessageBox(NULL,TEXT("The string contains end$ or end;"),TEXT(uname),MB_OK); + return(0); + } + if (strlen(s)>0) sendFileName(hnd,s); else { + MessageBox(NULL,TEXT("Empty string: "),TEXT(uname),MB_OK); + return 0; + } free(s); PostMessage(hnd,WM_CHAR,0xa,1); + return 0; +} + +int containEnd(char s[]) { + int i; + for (i=0; i