Chameleon Applications Commit Details - 303 - Chameleon related Applications (system preferences panels, helper applications)

Date:

2011-05-31 04:15:37 (12 years 10 months ago)

Author:

ErmaC

Commit:

303

Parents:

302

Message:

Latest Chameleon trunk changes.

Changes:

A	/branches/iFabio/Chameleon/i386/util/openUp.c
M	/branches/iFabio/Chameleon/i386/boot2/gui.h
M	/branches/iFabio/Chameleon/i386/libsaio/saio_internal.h
M	/branches/iFabio/Chameleon/i386/boot2/ramdisk.c
M	/branches/iFabio/Chameleon/i386/boot2/options.c
M	/branches/iFabio/Chameleon/i386/boot2/Makefile
M	/branches/iFabio/Chameleon/package/Resources/English.lproj/Localizable.strings
M	/branches/iFabio/Chameleon/i386/libsaio/xml.c
M	/branches/iFabio/Chameleon/i386/boot2/resume.c
M	/branches/iFabio/Chameleon/i386/boot2/boot.c
M	/branches/iFabio/Chameleon/i386/libsa/libsa.h
M	/branches/iFabio/Chameleon/Make.rules
M	/branches/iFabio/Chameleon/i386/boot2/modules.c
M	/branches/iFabio/Chameleon/i386/libsa/string.c
M	/branches/iFabio/Chameleon/i386/boot2/modules.h
M	/branches/iFabio/Chameleon/i386/boot2/mboot.c
M	/branches/iFabio/Chameleon/Chameleon.xcodeproj/project.pbxproj
M	/branches/iFabio/Chameleon/i386/boot2/gui.c

File differences

-356
357 357
358 358
359 
359
360 360
361 361
362 362
... ...
381 381
382 382
383 383
384 
384
385 385
386 386
387 387
... ...
424 424
425 425
426 426
427 
427
428 428
429 429
430 430
... ...
449 449
450 450
451 451
452 
452
453 453
454 454
455 455
... ...
670 670
671 671
672 672
673 
673
674 674
675 675
676 676
... ...
711 711
712 712
713 713
714 
714
715 715
716 716
717 717
... ...
732 732
733 733
734 734
735 
735
736 736
737 737
738 738
... ...
772 772
773 773
774 774
775 
775
776 776
777 777
778 778
... ...
804 804
805 805
806 806
807 
807
808 808
809 809
810 810
+␉␉␉␉else␊
␉␉␉␉{␊
␉␉␉␉␉printf("ParseStringID error (0x%x)\n", *val);␊
␉␉␉␉␉getc();␊
␉␉␉␉␉getchar();␊
␉␉␉␉␉return -1;␊
␉␉␉␉}␊
␉␉␉}␊

␉␉␉␉else␊
␉␉␉␉{␊
␉␉␉␉␉printf("ParseStringIDREF error (0x%x)\n", *val);␊
␉␉␉␉␉getc();␊
␉␉␉␉␉getchar();␊
␉␉␉␉␉return -1;␊
␉␉␉␉}␊
␉␉␉}␊

␉␉␉␉else␊
␉␉␉␉{␊
␉␉␉␉␉printf("ParseIntegerID error (0x%x)\n", *val);␊
␉␉␉␉␉getc();␊
␉␉␉␉␉getchar();␊
␉␉␉␉␉return -1;␊
␉␉␉␉}␊
␉␉␉}␊

␉␉␉␉else␊
␉␉␉␉{␊
␉␉␉␉␉printf("ParseStringIDREF error (0x%x)\n", *val);␊
␉␉␉␉␉getc();␊
␉␉␉␉␉getchar();␊
␉␉␉␉␉return -1;␊
␉␉␉␉}␊
␉␉␉}␊

␉if(buffer[0] == '<')␊
␉{␊
␉␉printf("Warning integer is non existant\n");␊
␉␉getc();␊
␉␉getchar();␊
␉␉tmpTag = NewTag();␊
␉␉tmpTag->type = kTagTypeInteger;␊
␉␉tmpTag->string = 0;␊

␉␉␉else␊
␉␉␉{␊
␉␉␉␉printf("ParseTagInteger hex error (0x%x) in buffer %s\n", *val, buffer);␊
␉␉␉␉getc();␊
␉␉␉␉getchar();␊
␉␉␉␉return -1;␊
␉␉␉}␊
␉␉}␊

␉␉␉␉if (*val < '0' || *val > '9')␊
␉␉␉␉{␊
␉␉␉␉␉printf("ParseTagInteger decimal error (0x%x) in buffer %s\n", *val, buffer);␊
␉␉␉␉␉getc();␊
␉␉␉␉␉getchar();␊
␉␉␉␉␉return -1;␊
␉␉␉␉}␊
␊

    ␊
␉//printf("ParseTagData unimplimented\n");␊
␉//printf("Data: %s\n", buffer);␊
␉//␉getc();␊
␉//␉getchar();␊
␉␊
␉// TODO: base64 decode␊
␉␊

    if (tmpTag == 0) return -1;␊
    ␊
␉printf("ParseTagDate unimplimented\n");␊
␉getc();␊
␉getchar();␊
␊
    tmpTag->type = kTagTypeDate;␊
    tmpTag->string = 0;␊
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ␉␉␉␉else␊
 ␉␉␉␉{␊
 ␉␉␉␉␉printf("ParseStringID error (0x%x)\n", *val);␊
-␉␉␉␉␉getc();␊
+␉␉␉␉␉getchar();␊
 ␉␉␉␉␉return -1;␊
 ␉␉␉␉}␊
 ␉␉␉}␊
 ␉␉␉␉else␊
 ␉␉␉␉{␊
 ␉␉␉␉␉printf("ParseStringIDREF error (0x%x)\n", *val);␊
-␉␉␉␉␉getc();␊
+␉␉␉␉␉getchar();␊
 ␉␉␉␉␉return -1;␊
 ␉␉␉␉}␊
 ␉␉␉}␊
 ␉␉␉␉else␊
 ␉␉␉␉{␊
 ␉␉␉␉␉printf("ParseIntegerID error (0x%x)\n", *val);␊
-␉␉␉␉␉getc();␊
+␉␉␉␉␉getchar();␊
 ␉␉␉␉␉return -1;␊
 ␉␉␉␉}␊
 ␉␉␉}␊
 ␉␉␉␉else␊
 ␉␉␉␉{␊
 ␉␉␉␉␉printf("ParseStringIDREF error (0x%x)\n", *val);␊
-␉␉␉␉␉getc();␊
+␉␉␉␉␉getchar();␊
 ␉␉␉␉␉return -1;␊
 ␉␉␉␉}␊
 ␉␉␉}␊
 ␉if(buffer[0] == '<')␊
 ␉{␊
 ␉␉printf("Warning integer is non existant\n");␊
-␉␉getc();␊
+␉␉getchar();␊
 ␉␉tmpTag = NewTag();␊
 ␉␉tmpTag->type = kTagTypeInteger;␊
 ␉␉tmpTag->string = 0;␊
 ␉␉␉else␊
 ␉␉␉{␊
 ␉␉␉␉printf("ParseTagInteger hex error (0x%x) in buffer %s\n", *val, buffer);␊
-␉␉␉␉getc();␊
+␉␉␉␉getchar();␊
 ␉␉␉␉return -1;␊
 ␉␉␉}␊
 ␉␉}␊
 ␉␉␉␉if (*val < '0' || *val > '9')␊
 ␉␉␉␉{␊
 ␉␉␉␉␉printf("ParseTagInteger decimal error (0x%x) in buffer %s\n", *val, buffer);␊
-␉␉␉␉␉getc();␊
+␉␉␉␉␉getchar();␊
 ␉␉␉␉␉return -1;␊
 ␉␉␉␉}␊
 ␊
     ␊
 ␉//printf("ParseTagData unimplimented\n");␊
 ␉//printf("Data: %s\n", buffer);␊
-␉//␉getc();␊
+␉//␉getchar();␊
 ␉␊
 ␉// TODO: base64 decode␊
 ␉␊
     if (tmpTag == 0) return -1;␊
     ␊
 ␉printf("ParseTagDate unimplimented\n");␊
-␉getc();␊
+␉getchar();␊
 ␊
     tmpTag->type = kTagTypeDate;␊
     tmpTag->string = 0;␊

-345
346 346
347 347
348 
349 
350 
351 
352 
353 
354 
355 348
356 349
357 350
+    return bootdevice;␊
}␊
␊
enum {␊
    kReturnKey     = 0x0d,␊
    kEscapeKey     = 0x1b,␊
    kBackspaceKey  = 0x08,␊
    kASCIIKeyMask  = 0x7f␊
};␊
␊
// This is the meat of our implementation.  It grabs the boot device from␊
// the multiboot_info and returns it as is.  If it fails it returns␊
// BAD_BOOT_DEVICE.  We can call an awful lot of libsa and libsaio but␊
     return bootdevice;␊
 }␊
 ␊
-enum {␊
-    kReturnKey     = 0x0d,␊
-    kEscapeKey     = 0x1b,␊
-    kBackspaceKey  = 0x08,␊
-    kASCIIKeyMask  = 0x7f␊
-};␊
-␊
 // This is the meat of our implementation.  It grabs the boot device from␊
 // the multiboot_info and returns it as is.  If it fails it returns␊
 // BAD_BOOT_DEVICE.  We can call an awful lot of libsa and libsaio but␊

-110
111 111
112 112
113
114
115
113 116
114 117
115 118
... ...
120 123
121 124
122 125
126
127
128
129
123 130
124 131
125 132
+␉␉-Wl,-sectcreate,__DATA,__Symbols,$(SYMROOT)/Symbols.dylib \␊
␉␉-o $(SYMROOT)/boot.sys $(filter %.o,$^) `find $(OBJROOT)/../boot2_modules/ -name \*.o` $(LIBS)  -lcc_kext␊
␊
␉@${RM} $(SYMROOT)/${SYMBOLS_MODULE}␊
␊
␊
␉@$(LD) -arch i386 \␊
␉-undefined dynamic_lookup \␊
␉-dylib -read_only_relocs suppress \␊

␉-macosx_version_min 10.6 \␊
␉-o $(OBJROOT)/Symbols_LINKER_ONLY.dylib␊
␊
␊
␊
␊
␊
endif␊
␊
␉@make embed_symbols␉␉# this is done in a sub process after boot.sys exists so the strings are populated correctly␊
 ...
 ␉␉-Wl,-sectcreate,__DATA,__Symbols,$(SYMROOT)/Symbols.dylib \␊
 ␉␉-o $(SYMROOT)/boot.sys $(filter %.o,$^) `find $(OBJROOT)/../boot2_modules/ -name \*.o` $(LIBS)  -lcc_kext␊
 ␊
+␉@${RM} $(SYMROOT)/${SYMBOLS_MODULE}␊
+␊
+␊
 ␉@$(LD) -arch i386 \␊
 ␉-undefined dynamic_lookup \␊
 ␉-dylib -read_only_relocs suppress \␊
 ␉-macosx_version_min 10.6 \␊
 ␉-o $(OBJROOT)/Symbols_LINKER_ONLY.dylib␊
 ␊
+␊
+␊
+␊
+␊
 endif␊
 ␊
 ␉@make embed_symbols␉␉# this is done in a sub process after boot.sys exists so the strings are populated correctly␊

-106
107 107
108 108
109 
109
110 110
111 111
112 112
... ...
119 119
120 120
121 121
122 
122
123 123
124 124
125 125
126 126
127 127
128 128
129 
129
130 130
131 131
132 132
133 133
134 134
135 135
136 
136
137 137
138 138
139 139
140 
140
141 141
142 142
143 143
144 144
145 145
146 
146
147 147
148 148
149 
149
150 150
151 151
152 
152
153 153
154 154
155 155
... ...
157 157
158 158
159 159
160 
160
161 161
162 162
163 163
164 164
165 165
166 166
167 
167
168 168
169 169
170 170
171 171
172 
172
173 173
174 174
175 175
... ...
197 197
198 198
199 199
200 
200
201 201
202 
202
203 203
204 204
205 205
+␉␊
␉size = ReadFileAtOffset (image_filename, header, 0, sizeof(IOHibernateImageHeader));␊
␉printf("header read size %x\n", size);␊
␉␉␊
␉␊
␉imageSize = header->image1Size;␊
␉codeSize  = header->restore1PageCount << 12;␊
␉if (kIOHibernateHeaderSignature != header->signature)␊

␉␉printf ("Resuming from Encrypted image is unsupported.\n"␊
␉␉␉␉"Uncheck \"Use secure virtual memory\" in \"Security\" pane on system preferences.\n"␊
␉␉␉␉"Press any key to proceed with normal boot.\n");␊
␉␉getc ();␊
␉␉getchar ();␊
␉␉return;␊
␉}␊
// depends on NVRAM␊
#if 0␊
␉{␊
␉␉uint32_t machineSignature;␊
␉␉size = GetProp(gChosenPH, kIOHibernateMachineSignatureKey, ␊
␉␉size = GetProp(gChosenPH, kIOHibernateMachineSignatureKey,␊
␉␉␉␉␉   (char *)&machineSignature, sizeof(machineSignature));␊
␉␉if (size != sizeof(machineSignature)) machineSignature = 0;␊
␉␉if (machineSignature != header->machineSignature)␊
␉␉␉break;␊
␉}␊
#endif␊
␉␉␊
␉␊
␉allocSize = imageSize + ((4095 + sizeof(hibernate_graphics_t)) & ~4095);␊
␊
␉mem_base = getmemorylimit() - allocSize;//TODO: lower this␊
␉␉␊
␉␊
␉printf("mem_base %x\n", mem_base);␊
␉// Rek : hibernate fix ␊
␉if (!((long long)mem_base+allocSize<1024*bootInfo->extmem+0x100000))␊
␉{␊
␉␉printf ("Not enough space to restore image. Press any key to proceed with normal boot.\n");␊
␉␉getc ();␊
␉␉getchar ();␊
␉␉return;␊
␉}␊
␉␉␊
␉␊
␉bcopy(header, (void *) mem_base, sizeof(IOHibernateImageHeader));␊
␉header = (IOHibernateImageHeader *) mem_base;␊
␉␉␊
␉␊
␉imageSize -= sizeof(IOHibernateImageHeader);␊
␉buffer = (long)(header + 1);␊
␉␊

␉{␊
␉␉uint64_t preview_offset = header->fileExtentMapSize - sizeof(header->fileExtentMap) + codeSize;␊
␉␉uint8_t progressSaveUnder[kIOHibernateProgressCount][kIOHibernateProgressSaveUnderSize];␊
␉␉␉␊
␉␉␊
␉␉ReadFileAtOffset (image_filename, (char *)buffer, sizeof(IOHibernateImageHeader), preview_offset+header->previewSize);␊
␉␉drawPreview ((void *)(long)(buffer+preview_offset + header->previewPageListSize), &(progressSaveUnder[0][0]));␊
␉␉previewTotalSectors = (imageSize-(preview_offset+header->previewSize))/512;␊
␉␉previewLoadedSectors = 0;␊
␉␉previewSaveunder = &(progressSaveUnder[0][0]);␊
␉␉if (preview_offset+header->previewSize<imageSize)␊
␉␉␉ReadFileAtOffset (image_filename, (char *)(long)(buffer+preview_offset+header->previewSize), ␊
␉␉␉ReadFileAtOffset (image_filename, (char *)(long)(buffer+preview_offset+header->previewSize),␊
␉␉␉␉␉␉␉  sizeof(IOHibernateImageHeader)+preview_offset+header->previewSize,␊
␉␉␉␉␉␉␉  imageSize-(preview_offset+header->previewSize));␊
␉␉previewTotalSectors = 0;␊
␉␉previewLoadedSectors = 0;␊
␉␉previewSaveunder = 0;␉␉␊
␉␉previewSaveunder = 0;␊
#if 0␊
␉␉AsereBLN:␊
␉␉check_vga_nvidia() didn't work as expected (recursion level > 0 & return value).␊

␉␉␉␉␉␉&cryptvars->ctx.decrypt);␊
␉␉␉␊
␉␉// set the vector for the following decryptions␊
␉␉bcopy(((uint8_t *) header) + header->image1Size - AES_BLOCK_SIZE, ␊
␉␉bcopy(((uint8_t *) header) + header->image1Size - AES_BLOCK_SIZE,␊
␉␉␉␉&cryptvars->aes_iv[0], AES_BLOCK_SIZE);␊
␉␉␉␊
␊
␉␉// decrypt the buffer␊
␉␉uint32_t len = (uint32_t)(header->image1Size - header->encryptStart);␊
␉␉aes_decrypt_cbc(((uint8_t *) header) + header->encryptStart,␊
 ...
 ...
 ...
 ␉␊
 ␉size = ReadFileAtOffset (image_filename, header, 0, sizeof(IOHibernateImageHeader));␊
 ␉printf("header read size %x\n", size);␊
-␉␉␊
+␉␊
 ␉imageSize = header->image1Size;␊
 ␉codeSize  = header->restore1PageCount << 12;␊
 ␉if (kIOHibernateHeaderSignature != header->signature)␊
 ␉␉printf ("Resuming from Encrypted image is unsupported.\n"␊
 ␉␉␉␉"Uncheck \"Use secure virtual memory\" in \"Security\" pane on system preferences.\n"␊
 ␉␉␉␉"Press any key to proceed with normal boot.\n");␊
-␉␉getc ();␊
+␉␉getchar ();␊
 ␉␉return;␊
 ␉}␊
 // depends on NVRAM␊
 #if 0␊
 ␉{␊
 ␉␉uint32_t machineSignature;␊
-␉␉size = GetProp(gChosenPH, kIOHibernateMachineSignatureKey, ␊
+␉␉size = GetProp(gChosenPH, kIOHibernateMachineSignatureKey,␊
 ␉␉␉␉␉   (char *)&machineSignature, sizeof(machineSignature));␊
 ␉␉if (size != sizeof(machineSignature)) machineSignature = 0;␊
 ␉␉if (machineSignature != header->machineSignature)␊
 ␉␉␉break;␊
 ␉}␊
 #endif␊
-␉␉␊
+␉␊
 ␉allocSize = imageSize + ((4095 + sizeof(hibernate_graphics_t)) & ~4095);␊
 ␊
 ␉mem_base = getmemorylimit() - allocSize;//TODO: lower this␊
-␉␉␊
+␉␊
 ␉printf("mem_base %x\n", mem_base);␊
 ␉// Rek : hibernate fix ␊
 ␉if (!((long long)mem_base+allocSize<1024*bootInfo->extmem+0x100000))␊
 ␉{␊
 ␉␉printf ("Not enough space to restore image. Press any key to proceed with normal boot.\n");␊
-␉␉getc ();␊
+␉␉getchar ();␊
 ␉␉return;␊
 ␉}␊
-␉␉␊
+␉␊
 ␉bcopy(header, (void *) mem_base, sizeof(IOHibernateImageHeader));␊
 ␉header = (IOHibernateImageHeader *) mem_base;␊
-␉␉␊
+␉␊
 ␉imageSize -= sizeof(IOHibernateImageHeader);␊
 ␉buffer = (long)(header + 1);␊
 ␉␊
 ␉{␊
 ␉␉uint64_t preview_offset = header->fileExtentMapSize - sizeof(header->fileExtentMap) + codeSize;␊
 ␉␉uint8_t progressSaveUnder[kIOHibernateProgressCount][kIOHibernateProgressSaveUnderSize];␊
-␉␉␉␊
+␉␉␊
 ␉␉ReadFileAtOffset (image_filename, (char *)buffer, sizeof(IOHibernateImageHeader), preview_offset+header->previewSize);␊
 ␉␉drawPreview ((void *)(long)(buffer+preview_offset + header->previewPageListSize), &(progressSaveUnder[0][0]));␊
 ␉␉previewTotalSectors = (imageSize-(preview_offset+header->previewSize))/512;␊
 ␉␉previewLoadedSectors = 0;␊
 ␉␉previewSaveunder = &(progressSaveUnder[0][0]);␊
 ␉␉if (preview_offset+header->previewSize<imageSize)␊
-␉␉␉ReadFileAtOffset (image_filename, (char *)(long)(buffer+preview_offset+header->previewSize), ␊
+␉␉␉ReadFileAtOffset (image_filename, (char *)(long)(buffer+preview_offset+header->previewSize),␊
 ␉␉␉␉␉␉␉  sizeof(IOHibernateImageHeader)+preview_offset+header->previewSize,␊
 ␉␉␉␉␉␉␉  imageSize-(preview_offset+header->previewSize));␊
 ␉␉previewTotalSectors = 0;␊
 ␉␉previewLoadedSectors = 0;␊
-␉␉previewSaveunder = 0;␉␉␊
+␉␉previewSaveunder = 0;␊
 #if 0␊
 ␉␉AsereBLN:␊
 ␉␉check_vga_nvidia() didn't work as expected (recursion level > 0 & return value).␊
 ␉␉␉␉␉␉&cryptvars->ctx.decrypt);␊
 ␉␉␉␊
 ␉␉// set the vector for the following decryptions␊
-␉␉bcopy(((uint8_t *) header) + header->image1Size - AES_BLOCK_SIZE, ␊
+␉␉bcopy(((uint8_t *) header) + header->image1Size - AES_BLOCK_SIZE,␊
 ␉␉␉␉&cryptvars->aes_iv[0], AES_BLOCK_SIZE);␊
-␉␉␉␊
+␊
 ␉␉// decrypt the buffer␊
 ␉␉uint32_t len = (uint32_t)(header->image1Size - header->encryptStart);␊
 ␉␉aes_decrypt_cbc(((uint8_t *) header) + header->encryptStart,␊

-186
187 187
188 188
189 
189
190 190
191 191
192 192
... ...
351 351
352 352
353 353
354 
354
355 355
356 356
357 357
+␉bool dummyVal;␊
␉if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->bootConfig) && dummyVal) {␊
␉␉printf("Press any key to continue...");␊
␉␉getc();␊
␉␉getchar();␊
␉}␊
␉␊
␉usb_loop();␊

#if DEBUG␊
    printf(" Default: %d, ->biosdev: %d, ->part_no: %d ->flags: %d\n", gBootVolume, gBootVolume->biosdev, gBootVolume->part_no, gBootVolume->flags);␊
    printf(" bt(0,0): %d, ->biosdev: %d, ->part_no: %d ->flags: %d\n", gBIOSBootVolume, gBIOSBootVolume->biosdev, gBIOSBootVolume->part_no, gBIOSBootVolume->flags);␊
    getc();␊
    getchar();␊
#endif␊
␊
␉useGUI = true;␊
 ...
 ␉bool dummyVal;␊
 ␉if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->bootConfig) && dummyVal) {␊
 ␉␉printf("Press any key to continue...");␊
-␉␉getc();␊
+␉␉getchar();␊
 ␉}␊
 ␉␊
 ␉usb_loop();␊
 #if DEBUG␊
     printf(" Default: %d, ->biosdev: %d, ->part_no: %d ->flags: %d\n", gBootVolume, gBootVolume->biosdev, gBootVolume->part_no, gBootVolume->flags);␊
     printf(" bt(0,0): %d, ->biosdev: %d, ->part_no: %d ->flags: %d\n", gBIOSBootVolume, gBIOSBootVolume->biosdev, gBIOSBootVolume->part_no, gBIOSBootVolume->flags);␊
-    getc();␊
+    getchar();␊
 #endif␊
 ␊
 ␉useGUI = true;␊

-1058
1059 1059
1060 1060
1061 
1061
1062
1062 1063
1063 1064
1064 1065
... ...
1608 1609
1609 1610
1610 1611
1611 
1612
1612 1613
1613 1614
1614 1615
+␉}␊
}␊
␊
struct putc_info {␊
struct putc_info //Azi: same as below␊
{␊
    char * str;␊
    char * last_str;␊
};␊

␉␉␊
␉␉updateVRAM();␊
␉␉␊
␉␉key = getc();␊
␉␉key = getchar();␊
␉␉␉␊
␉␉if( key == kUpArrowkey )␊
␉␉␉if( currentline > 0 )␊
 ...
 ␉}␊
 }␊
 ␊
-struct putc_info {␊
+struct putc_info //Azi: same as below␊
+{␊
     char * str;␊
     char * last_str;␊
 };␊
 ␉␉␊
 ␉␉updateVRAM();␊
 ␉␉␊
-␉␉key = getc();␊
+␉␉key = getchar();␊
 ␉␉␉␊
 ␉␉if( key == kUpArrowkey )␊
 ␉␉␉if( currentline > 0 )␊

-41
42 42
43 43
44 
44
45 45
46 46
47 47
+enum {␊
␉kBackspaceKey␉␉= 0x08,␊
␉kTabKey␉␉␉= 0x09,␊
␉kReturnKey␉␉= 0x0d,␊
␉kReturnKey␉␉= '\n',␊
␉kEscapeKey␉␉= 0x1b,␊
␉kUpArrowkey␉␉= 0x4800, ␊
␉kDownArrowkey␉␉= 0x5000,␊
 enum {␊
 ␉kBackspaceKey␉␉= 0x08,␊
 ␉kTabKey␉␉␉= 0x09,␊
-␉kReturnKey␉␉= 0x0d,␊
+␉kReturnKey␉␉= '\n',␊
 ␉kEscapeKey␉␉= 0x1b,␊
 ␉kUpArrowkey␉␉= 0x4800, ␊
 ␉kDownArrowkey␉␉= 0x5000,␊

-290
291 291
292 292
293 
293
294 294
295 295
296 296
... ...
303 303
304 304
305 305
306 
306
307 307
308 308
309 309
+␉␉setCursorPosition(0, 0, 1);␊
␉␉showInfoRAMDisk();␊
␉␉printf("\n\nPress any key to continue.\n");␊
␉␉getc();␊
␉␉getchar();␊
␉␉setActiveDisplayPage(0);␊
␉}␊
␉else␊

␉␉printf("\n?rd m <filename> - mount ramdisk image\n?rd u - unmount ramdisk image");␊
␉␉printf("\n?rd e - enable bt(0,0) alias\n?rd d - disable bt(0,0) alias");␊
␉␉printf("\n\nPress any key to continue.\n");␊
␉␉getc();␊
␉␉getchar();␊
␉␉setActiveDisplayPage(0);␊
␉}␊
}␊
 ...
 ␉␉setCursorPosition(0, 0, 1);␊
 ␉␉showInfoRAMDisk();␊
 ␉␉printf("\n\nPress any key to continue.\n");␊
-␉␉getc();␊
+␉␉getchar();␊
 ␉␉setActiveDisplayPage(0);␊
 ␉}␊
 ␉else␊
 ␉␉printf("\n?rd m <filename> - mount ramdisk image\n?rd u - unmount ramdisk image");␊
 ␉␉printf("\n?rd e - enable bt(0,0) alias\n?rd d - disable bt(0,0) alias");␊
 ␉␉printf("\n\nPress any key to continue.\n");␊
-␉␉getc();␊
+␉␉getchar();␊
 ␉␉setActiveDisplayPage(0);␊
 ␉}␊
 }␊

-911
912 912
913 913
914 
914
915 915
916 916
917 917
... ...
1383 1383
1384 1384
1385 1385
1386 
1386
1387 1387
1388 1388
1389 1389
... ...
1450 1450
1451 1451
1452 1452
1453 
1453
1454 1454
1455 1455
1456 1456
... ...
1501 1501
1502 1502
1503 1503
1504 
1504
1505 1505
1506 1506
1507 1507
+␉␉␉// reset cursor co-ords␊
␉␉␉gui.debug.cursor = pos( gui.screen.width - 160 , 10 );␊
␉␉}␊
␉␉key = getc();␊
␉␉key = getchar();␊
␉␉updateMenu( key, (void **) &menuBVR );␊
␉␉newShowPrompt = (gDeviceCount == 0) || (menuBVR->flags & kBVFlagNativeBoot);␊
␊

␉␉␉printf("[Type %s%sq to quit viewer]", (line_offset > 0) ? "p for previous page, " : "", (*bp != '\1') ? "space for next page, " : "");␊
␉␉}␊
␊
␉␉c = getc();␊
␉␉c = getchar();␊
␉␉if (c == 'q' || c == 'Q') {␊
␉␉␉break;␊
␉␉}␊

␉printf("Typical boot devices are 80 (First HD), 81 (Second HD)\n");␊
␉printf("Enter two-digit hexadecimal boot device [%02x]: ", bootdevice);␊
␉do {␊
␉␉key = getc();␊
␉␉key = getchar();␊
␉␉switch (key & kASCIIKeyMask) {␊
␉␉case kBackspaceKey:␊
␉␉␉if (digitsI > 0) {␊

bool promptForRescanOption(void)␊
{␊
␉printf("\nWould you like to enable media rescan option?\nPress ENTER to enable or any key to skip.\n");␊
␉if (getc() == kReturnKey) {␊
␉if (getchar() == kReturnKey) {␊
␉␉return true;␊
␉} else {␊
␉␉return false;␊
 ...
 ...
 ...
 ␉␉␉// reset cursor co-ords␊
 ␉␉␉gui.debug.cursor = pos( gui.screen.width - 160 , 10 );␊
 ␉␉}␊
-␉␉key = getc();␊
+␉␉key = getchar();␊
 ␉␉updateMenu( key, (void **) &menuBVR );␊
 ␉␉newShowPrompt = (gDeviceCount == 0) || (menuBVR->flags & kBVFlagNativeBoot);␊
 ␊
 ␉␉␉printf("[Type %s%sq to quit viewer]", (line_offset > 0) ? "p for previous page, " : "", (*bp != '\1') ? "space for next page, " : "");␊
 ␉␉}␊
 ␊
-␉␉c = getc();␊
+␉␉c = getchar();␊
 ␉␉if (c == 'q' || c == 'Q') {␊
 ␉␉␉break;␊
 ␉␉}␊
 ␉printf("Typical boot devices are 80 (First HD), 81 (Second HD)\n");␊
 ␉printf("Enter two-digit hexadecimal boot device [%02x]: ", bootdevice);␊
 ␉do {␊
-␉␉key = getc();␊
+␉␉key = getchar();␊
 ␉␉switch (key & kASCIIKeyMask) {␊
 ␉␉case kBackspaceKey:␊
 ␉␉␉if (digitsI > 0) {␊
 bool promptForRescanOption(void)␊
 {␊
 ␉printf("\nWould you like to enable media rescan option?\nPress ENTER to enable or any key to skip.\n");␊
-␉if (getc() == kReturnKey) {␊
+␉if (getchar() == kReturnKey) {␊
 ␉␉return true;␊
 ␉} else {␊
 ␉␉return false;␊

-70
71 71
72 72
73 
74 73
75 74
76 75
... ...
95 94
96 95
97 96
98 
97
99 98
100 99
101 100
+    return ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'));␊
}␊
␊
//Azi: TODO - add more ponctuation characters as needed; at least these two, i need for PartNo.␊
static inline int ispunct(int c)␊
{␊
    return (c == '.' || c == '-');␊

extern int    strncmp(const char * s1, const char * s2, size_t n);␊
extern char * strcpy(char * s1, const char * s2);␊
extern char * strncpy(char * s1, const char * s2, size_t n);␊
extern char * strlcpy(char * s1, const char * s2, size_t n);␊
extern size_t strlcpy(char * s1, const char * s2, size_t n);␊
extern char * strstr(const char *in, const char *str);␊
extern int    atoi(const char * str);␊
extern int    ptol(const char * str);␊
 ...
     return ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'));␊
 }␊
 ␊
-//Azi: TODO - add more ponctuation characters as needed; at least these two, i need for PartNo.␊
 static inline int ispunct(int c)␊
 {␊
     return (c == '.' || c == '-');␊
 extern int    strncmp(const char * s1, const char * s2, size_t n);␊
 extern char * strcpy(char * s1, const char * s2);␊
 extern char * strncpy(char * s1, const char * s2, size_t n);␊
-extern char * strlcpy(char * s1, const char * s2, size_t n);␊
+extern size_t strlcpy(char * s1, const char * s2, size_t n);␊
 extern char * strstr(const char *in, const char *str);␊
 extern int    atoi(const char * str);␊
 extern int    ptol(const char * str);␊

-186
187 187
188 188
189 
189
190 190
191 191
192 
193 192
194 193
195 194
196 
195
197 196
198 197
199 198
+␉return ret;␊
}␊
␊
char *␊
size_t␊
strlcpy(char * s1, const char * s2, size_t n)␊
{␊
␉register char *ret = s1;␊
␉while (n && (*s1++ = *s2++))␊
␉␉n--;␊
␉if (!n) *--s1=0;␊
␉return ret;␊
␉return strlen(s2);␊
}␊
␊
char *␊
 ␉return ret;␊
 }␊
 ␊
-char *␊
+size_t␊
 strlcpy(char * s1, const char * s2, size_t n)␊
 {␊
-␉register char *ret = s1;␊
 ␉while (n && (*s1++ = *s2++))␊
 ␉␉n--;␊
 ␉if (!n) *--s1=0;␊
-␉return ret;␊
+␉return strlen(s2);␊
 }␊
 ␊
 char *␊

Download the corresponding diff file