avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-09-27 14:35:27 +00:00
Code Issues Projects Releases Wiki Activity

* main.c (main): Don't indent CPP directives.

Browse Source 
When showing update progress in a no tty situation, use unbuffered IO
for all systems, not just win32 native.
Update copyright year when printing version.
Remove warning about native win32 being experimental.
Split a line string.
* ppiwin.c: Update copyright year.
Add cvs Id keyword.
(usleep): Cleanup debug CPP directives to improve readability.
* ser_win32.c: Include <stdio.h> to fix failing build.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@430 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Theodore A. Roth
2004-07-15 17:29:35 +00:00
parent 443cc23ae9
commit 5b7f00e024
4 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main.c
View File

@@ -747,12 +747,12 @@ int main(int argc, char * argv [])
baudrate = 0;
#if defined(WIN32NATIVE)
#if defined(WIN32NATIVE)
win_sys_config_set(sys_config);
win_usr_config_set(usr_config);
#else
#else
strcpy(sys_config, CONFIG_DIR);
i = strlen(sys_config);
@@ -770,7 +770,7 @@ int main(int argc, char * argv [])
strcat(usr_config, ".avrduderc");
}
#endif
#endif
len = strlen(progname) + 2;
for (i=0; i<len; i++)
@@ -904,13 +904,11 @@ int main(int argc, char * argv [])
update_progress = update_progress_tty;
else {
update_progress = update_progress_no_tty;
#if defined(WIN32NATIVE)
/* disable all buffering of stderr for compatibility with
software that captures and redirects output to a GUI
i.e. Programmers Notepad */
setvbuf( stderr, NULL, _IONBF, 0 );
setvbuf( stdout, NULL, _IONBF, 0 );
#endif /* WIN32NATIVE */
}
}
@@ -921,13 +919,8 @@ int main(int argc, char * argv [])
*/
fprintf(stderr,
"\n%s: Version %s\n"
"%sCopyright (c) 2000-2003 Brian Dean, bsd@bsdhome.com\n\n",
"%sCopyright (c) 2000-2004 Brian Dean, bsd@bsdhome.com\n\n",
progname, version, progbuf);
#if defined(WIN32NATIVE)
#warning "Experimental Win32 Native Build"
fprintf(stderr,"%sExperimental Windows32 native build by Martin Thomas\n\n",
progbuf);
#endif
}
if (verbose) {
@@ -1218,7 +1211,8 @@ int main(int argc, char * argv [])
if ((strcasecmp(m->desc, "flash") == 0) && (upd->op == DEVICE_WRITE)) {
erase = 1;
fprintf(stderr,
"%s: NOTE: FLASH memory has been specified, an erase cycle will be performed\n"
"%s: NOTE: FLASH memory has been specified, an erase cycle "
"will be performed\n"
"%sTo disable this feature, specify the -D option.\n",
progname, progbuf);
break;