imach/src/imach.c - diff

Return to imach.c CVS log

Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.146 and 1.152

version 1.146, 2014/06/16 10:20:28	version 1.152, 2014/06/18 17:54:09
Line 1	Line 1
/* $Id$	/* $Id$
$State$	$State$
$Log$	$Log$
	Revision 1.152 2014/06/18 17:54:09 brouard
	Summary: open browser, use gnuplot on same dir than imach if not found in the path

	Revision 1.151 2014/06/18 16:43:30 brouard
	* empty log message *

	Revision 1.150 2014/06/18 16:42:35 brouard
	Summary: If gnuplot is not in the path try on same directory than imach binary (OSX)
	Author: brouard

	Revision 1.149 2014/06/18 15:51:14 brouard
	Summary: Some fixes in parameter files errors
	Author: Nicolas Brouard

	Revision 1.148 2014/06/17 17:38:48 brouard
	Summary: Nothing new
	Author: Brouard

	Just a new packaging for OS/X version 0.98nS

	Revision 1.147 2014/06/16 10:33:11 brouard
	* empty log message *

Revision 1.146 2014/06/16 10:20:28 brouard	Revision 1.146 2014/06/16 10:20:28 brouard
Summary: Merge	Summary: Merge
Author: Brouard	Author: Brouard
Line 483 extern int errno;	Line 506 extern int errno;
#define ODIRSEPARATOR '/'	#define ODIRSEPARATOR '/'
#endif	#endif

<<<<<<< imach.c
/* $Id$ */
=======
/* $Id$ */	/* $Id$ */
>>>>>>> 1.145
/* $State$ */	/* $State$ */

<<<<<<< imach.c	char version[]="Imach version 0.98nT, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";
char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";
char fullversion[]="$Revision$ $Date$";	char fullversion[]="$Revision$ $Date$";
=======
char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";
char fullversion[]="$Revision$ $Date$";
>>>>>>> 1.145
char strstart[80];	char strstart[80];
char optionfilext[10], optionfilefiname[FILENAMELENGTH];	char optionfilext[10], optionfilefiname[FILENAMELENGTH];
int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */	int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */
Line 5385 int main(int argc, char *argv[])	Line 5399 int main(int argc, char *argv[])
/---------arguments file --------/	/---------arguments file --------/

if((ficpar=fopen(optionfile,"r"))==NULL) {	if((ficpar=fopen(optionfile,"r"))==NULL) {
printf("Problem with optionfile %s\n",optionfile);	printf("Problem with optionfile %s with errno=%s\n",optionfile,strerror(errno));
fprintf(ficlog,"Problem with optionfile %s\n",optionfile);	fprintf(ficlog,"Problem with optionfile %s with errno=%s\n",optionfile,strerror(errno));
fflush(ficlog);	fflush(ficlog);
goto end;	/* goto end; */
	exit(70);
}	}


Line 6658 Interval (in months) between two waves:	Line 6673 Interval (in months) between two waves:
printf("Starting graphs with: %s\n",plotcmd);fflush(stdout);	printf("Starting graphs with: %s\n",plotcmd);fflush(stdout);

if((outcmd=system(plotcmd)) != 0){	if((outcmd=system(plotcmd)) != 0){
printf("\n Problem with gnuplot\n");	printf("\n Problem with gnuplot command %s\n", plotcmd);
	printf("\n Trying on same directory\n");
	sprintf(plotcmd,"%sgnuplot %s", pathimach, optionfilegnuplot);
	if((outcmd=system(plotcmd)) != 0)
	printf("\n Still a problem with gnuplot command %s\n", plotcmd);
}	}
printf(" Wait...");	printf(" Wait...");
while (z[0] != 'q') {	while (z[0] != 'q') {
Line 6667 Interval (in months) between two waves:	Line 6686 Interval (in months) between two waves:
scanf("%s",z);	scanf("%s",z);
/* if (z[0] == 'c') system("./imach"); */	/* if (z[0] == 'c') system("./imach"); */
if (z[0] == 'e') {	if (z[0] == 'e') {
printf("Starting browser with: %s",optionfilehtm);fflush(stdout);	#ifdef OSX
system(optionfilehtm);	sprintf(pplotcmd, "open %s", optionfilehtm);
	#elsedef
	sprintf(pplotcmd, "%s", optionfilehtm);
	#enddef
	printf("Starting browser with: %s",plotcmd);fflush(stdout);
	system(plotcmd);
}	}
else if (z[0] == 'g') system(plotcmd);	else if (z[0] == 'g') system(plotcmd);
else if (z[0] == 'q') exit(0);	else if (z[0] == 'q') exit(0);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.146
changed lines
	Added in v.1.152