--- imach/src/imach.c 2014/08/27 16:26:55 1.157 +++ imach/src/imach.c 2014/08/27 17:11:51 1.158 @@ -1,6 +1,9 @@ -/* $Id: imach.c,v 1.157 2014/08/27 16:26:55 brouard Exp $ +/* $Id: imach.c,v 1.158 2014/08/27 17:11:51 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.158 2014/08/27 17:11:51 brouard + *** empty log message *** + Revision 1.157 2014/08/27 16:26:55 brouard Summary: Preparing windows Visual studio version Author: Brouard @@ -532,11 +535,11 @@ extern int errno; #define ODIRSEPARATOR '\\' #endif -/* $Id: imach.c,v 1.157 2014/08/27 16:26:55 brouard Exp $ */ +/* $Id: imach.c,v 1.158 2014/08/27 17:11:51 brouard Exp $ */ /* $State: Exp $ */ char version[]="Imach version 0.98nX, August 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)"; -char fullversion[]="$Revision: 1.157 $ $Date: 2014/08/27 16:26:55 $"; +char fullversion[]="$Revision: 1.158 $ $Date: 2014/08/27 17:11:51 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -6696,15 +6699,15 @@ Interval (in months) between two waves: sprintf(plotcmd,"\"%sgnuplot.exe\"",pathimach); #endif if(!stat(plotcmd,&info)){ - printf("Error or gnuplot program not found: %s\n",plotcmd);fflush(stdout); + printf("Error or gnuplot program not found: '%s'\n",plotcmd);fflush(stdout); if(!stat(getenv("GNUPLOTBIN"),&info)){ - printf("Error or gnuplot program not found: %s Environment GNUPLOTBIN not set.\n",plotcmd);fflush(stdout); + printf("Error or gnuplot program not found: '%s' Environment GNUPLOTBIN not set.\n",plotcmd);fflush(stdout); }else strcpy(pplotcmd,plotcmd); #ifdef __unix strcpy(plotcmd,GNUPLOTPROGRAM); if(!stat(plotcmd,&info)){ - printf("Error gnuplot program not found: %s\n",plotcmd);fflush(stdout); + printf("Error gnuplot program not found: '%s'\n",plotcmd);fflush(stdout); }else strcpy(pplotcmd,plotcmd); #endif @@ -6712,23 +6715,23 @@ Interval (in months) between two waves: strcpy(pplotcmd,plotcmd); sprintf(plotcmd,"%s %s",pplotcmd, optionfilegnuplot); - printf("Starting graphs with: %s\n",plotcmd);fflush(stdout); + printf("Starting graphs with: '%s'\n",plotcmd);fflush(stdout); if((outcmd=system(plotcmd)) != 0){ - printf("gnuplot command might not be in your path: %s, err=%d\n", plotcmd, outcmd); + printf("gnuplot command might not be in your path: '%s', err=%d\n", plotcmd, outcmd); printf("\n Trying if gnuplot resides on the same directory that IMaCh\n"); sprintf(plotcmd,"%sgnuplot %s", pathimach, optionfilegnuplot); if((outcmd=system(plotcmd)) != 0) printf("\n Still a problem with gnuplot command %s, err=%d\n", plotcmd, outcmd); } - printf(" Successul, please wait..."); + printf(" Successful, please wait..."); while (z[0] != 'q') { /* chdir(path); */ printf("\nType e to edit results with your browser, g to graph again and q for exit: "); scanf("%s",z); /* if (z[0] == 'c') system("./imach"); */ if (z[0] == 'e') { -#ifdef _APPLE_ +#ifdef __APPLE__ sprintf(pplotcmd, "open %s", optionfilehtm); #elif __linux sprintf(pplotcmd, "xdg-open %s", optionfilehtm);