vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2010-01-08 Robert Millan <rmh.mkisofs@aybabtu.com>

Browse source 
* util/mkisofs/defaults.h (APPID_DEFAULT): Redefine using PACKAGE_NAME.
	(SYSTEM_ID_DEFAULT): Set to "GNU" unconditionally.
	* util/mkisofs/mkisofs.c (main): Readjust --version output.
This commit is contained in:
Robert Millan 2010-01-08 15:19:42 +00:00
parent bc8b32b3ec
commit cd943b7587
3 changed files with 9 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-01-08 Robert Millan <rmh.mkisofs@aybabtu.com>
* util/mkisofs/defaults.h (APPID_DEFAULT): Redefine using PACKAGE_NAME.
(SYSTEM_ID_DEFAULT): Set to "GNU" unconditionally.
* util/mkisofs/mkisofs.c (main): Readjust --version output.
2010-01-07 Robert Millan <rmh.grub@aybabtu.com> 2010-01-07 Robert Millan <rmh.grub@aybabtu.com>
Reset Multiboot 2 support. New loader implements the draft in Reset Multiboot 2 support. New loader implements the draft in

38
util/mkisofs/defaults.h
View file

@ -8,7 +8,7 @@
#define PREPARER_DEFAULT NULL #define PREPARER_DEFAULT NULL
#define PUBLISHER_DEFAULT NULL #define PUBLISHER_DEFAULT NULL
#ifndef APPID_DEFAULT #ifndef APPID_DEFAULT
#define APPID_DEFAULT "MKISOFS ISO 9660 FILESYSTEM BUILDER" #define APPID_DEFAULT PACKAGE_NAME " ISO 9660 filesystem builder"
#endif #endif
#define COPYRIGHT_DEFAULT NULL #define COPYRIGHT_DEFAULT NULL
#define BIBLIO_DEFAULT NULL #define BIBLIO_DEFAULT NULL
@ -17,38 +17,4 @@
#define VOLUME_ID_DEFAULT "CDROM" #define VOLUME_ID_DEFAULT "CDROM"
#define BOOT_CATALOG_DEFAULT "boot.catalog" #define BOOT_CATALOG_DEFAULT "boot.catalog"
#define BOOT_IMAGE_DEFAULT NULL #define BOOT_IMAGE_DEFAULT NULL
#ifdef __QNX__ #define SYSTEM_ID_DEFAULT "GNU"
#define SYSTEM_ID_DEFAULT "QNX"
#endif
#ifdef __osf__
#define SYSTEM_ID_DEFAULT "OSF"
#endif
#ifdef __sun
#ifdef __SVR4
#define SYSTEM_ID_DEFAULT "Solaris"
#else
#define SYSTEM_ID_DEFAULT "SunOS"
#endif
#endif
#ifdef __hpux
#define SYSTEM_ID_DEFAULT "HP-UX"
#endif
#ifdef __sgi
#define SYSTEM_ID_DEFAULT "SGI"
#endif
#ifdef _AIX
#define SYSTEM_ID_DEFAULT "AIX"
#endif
#ifdef _WIN
#define SYSTEM_ID_DEFAULT "Win32"
#endif /* _WIN */
#ifndef SYSTEM_ID_DEFAULT
#define SYSTEM_ID_DEFAULT "LINUX"
#endif

2
util/mkisofs/mkisofs.c
View file

@ -914,7 +914,7 @@ int FDECL2(main, int, argc, char **, argv){
exit (0); exit (0);
break; break;
case OPTION_VERSION: case OPTION_VERSION:
printf ("%s (%s %s)\n", program_name, PACKAGE_NAME, PACKAGE_VERSION); printf ("%s version %s\n", PACKAGE_NAME, PACKAGE_VERSION);
exit (0); exit (0);
break; break;
case OPTION_NOSPLIT_SL_COMPONENT: case OPTION_NOSPLIT_SL_COMPONENT: