Index: redboot/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/redboot/current/ChangeLog,v retrieving revision 1.187 diff -u -5 -r1.187 ChangeLog --- redboot/current/ChangeLog 28 Feb 2004 16:51:08 -0000 1.187 +++ redboot/current/ChangeLog 2 Mar 2004 19:32:10 -0000 @@ -1,5 +1,11 @@ +2004-03-02 Andrew Dyer + + * src/load.c: add -p option to help string and only print it and -h if + CYGPKG_REDBOOT_NETWORKING is enabled. Add a CR to the end of the + SHORT_DATA message string + 2004-02-27 Jani Monoses * src/net/http_client.c: Close connection with abort instead of friendly close since for ELF files we don't read the whole content but end the connection when the runnable parts are in. The server Index: redboot/current/src/load.c =================================================================== RCS file: /cvs/ecos/ecos/packages/redboot/current/src/load.c,v retrieving revision 1.40 diff -u -5 -r1.40 load.c --- redboot/current/src/load.c 26 Feb 2004 11:12:10 -0000 1.40 +++ redboot/current/src/load.c 2 Mar 2004 19:32:11 -0000 @@ -75,11 +75,14 @@ static char usage[] = "[-r] [-v] " #ifdef CYGBLD_BUILD_REDBOOT_WITH_ZLIB "[-d] " #endif - "[-h ] [-m ] " +#ifdef CYGPKG_REDBOOT_NETWORKING + "[-h ] [-p ]" +#endif + "[-m ] " #if CYGNUM_HAL_VIRTUAL_VECTOR_NUM_CHANNELS > 1 "[-c ] " #endif "\n [-b ] "; @@ -296,11 +299,11 @@ int phx, len, ch; unsigned char *addr; unsigned long addr_offset = 0; unsigned long highest_address = 0; unsigned long lowest_address = 0xFFFFFFFF; - unsigned char *SHORT_DATA = "Short data reading ELF file"; + unsigned char *SHORT_DATA = "Short data reading ELF file\n"; // Read the header if (_read(getc, (unsigned char *)&ehdr, sizeof(ehdr)) != sizeof(ehdr)) { diag_printf("Can't read ELF header\n"); return 0;