*Reverted giantpunes work on forwarder source and added mine (worked parallel didnt know he was doing it) | added mine because its bit more clean and got a check if the CFG file doesnt exist

This commit is contained in:
dimok321 2009-05-30 21:45:59 +00:00
parent b4ba424be0
commit 11e17e07ab
3 changed files with 208 additions and 184 deletions

75
source/cfg.c Normal file
View File

@ -0,0 +1,75 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
#include <ctype.h>
#include <ogcsys.h>
#include "cfg.h"
static char *cfg_name, *cfg_val;
char* strcopy(char *dest, char *src, int size)
{
strncpy(dest,src,size);
dest[size-1] = 0;
return dest;
}
char* trimcopy(char *dest, char *src, int size)
{
int len;
while (*src == ' ') src++;
len = strlen(src);
// trim trailing " \r\n"
while (len > 0 && strchr(" \r\n", src[len-1])) len--;
if (len >= size) len = size-1;
strncpy(dest, src, len);
dest[len] = 0;
return dest;
}
void cfg_parseline(char *line, void (*set_func)(char*, char*))
{
// split name = value
char tmp[200], name[100], val[100];
strcopy(tmp, line, sizeof(tmp));
char *eq = strchr(tmp, '=');
if (!eq) return;
*eq = 0;
trimcopy(name, tmp, sizeof(name));
trimcopy(val, eq+1, sizeof(val));
//printf("CFG: %s = %s\n", name, val);
set_func(name, val);
}
bool cfg_parsefile(char *fname, void (*set_func)(char*, char*))
{
FILE *f;
char line[200];
//printf("opening(%s)\n", fname);
f = fopen(fname, "r");
if (!f) {
//printf("error opening(%s)\n", fname);
return false;
}
while (fgets(line, sizeof(line), f)) {
// lines starting with # are comments
if (line[0] == '#') continue;
cfg_parseline(line, set_func);
}
fclose(f);
return true;
}
void cfg_set(char *name, char *val)
{
cfg_name = name;
cfg_val = val;
if (strcmp(name, "update_path") == 0) {
strcopy(update_path, val, sizeof(update_path));
}
}

18
source/cfg.h Normal file
View File

@ -0,0 +1,18 @@
#ifndef _CFG_H_
#define _CFG_H_
#ifdef __cplusplus
extern "C"
{
#endif
char update_path[150];
void cfg_set(char *name, char *val);
bool cfg_parsefile(char * fname, void (*set_func)(char*, char*));
#ifdef __cplusplus
}
#endif
#endif

View File

@ -5,6 +5,7 @@
*
* Copyright 2009 The Lemon Man
* Thanks to luccax, Wiipower, Aurelio and crediar
* GX added by dimok (thanks to Tantric)
* usbGecko powered by Nuke
*
* This program is free software; you can redistribute it and/or modify
@ -31,15 +32,13 @@
#include <stdio.h>
#include <stdlib.h>
#include <ogc/machine/processor.h>
//shit i added
#include <string.h>
#include "pngu/pngu.h"
#include "video.h"
#include "filelist.h"
#include "dolloader.h"
#include "elfloader.h"
#include "cfg.h"
PNGUPROP imgProp;
@ -78,91 +77,17 @@ void Background_Show(int x, int y, int z, u8 * data, int angle, int scaleX, int
Menu_DrawImg(x, y, z, imgProp.imgWidth, imgProp.imgHeight, data, angle, scaleX, scaleY, alpha);
}
char thePath[100];
static char *cfg_name, *cfg_val;
char* strcopy(char *dest, char *src, int size)
{
strncpy(dest,src,size);
dest[size-1] = 0;
return dest;
}
char* trimcopy(char *dest, char *src, int size)
{
int len;
while (*src == ' ') src++;
len = strlen(src);
// trim trailing " \r\n"
while (len > 0 && strchr(" \r\n", src[len-1])) len--;
if (len >= size) len = size-1;
strncpy(dest, src, len);
dest[len] = 0;
return dest;
}
void cfg_parseline(char *line, void (*set_func)(char*, char*))
{
// split name = value
char tmp[200], name[100], val[100];
strcopy(tmp, line, sizeof(tmp));
char *eq = strchr(tmp, '=');
if (!eq) return;
*eq = 0;
trimcopy(name, tmp, sizeof(name));
trimcopy(val, eq+1, sizeof(val));
set_func(name, val);
}
bool cfg_parsefile(char *fname, void (*set_func)(char*, char*))
{
FILE *f;
char line[200];
f = fopen(fname, "r");
if (!f) {
return false;
}
while (fgets(line, sizeof(line), f)) {
// lines starting with # are comments
if (line[0] == '#') continue;
cfg_parseline(line, set_func);
}
fclose(f);
return true;
}
char pathname[200];
void cfg_set(char *name, char *val)
{
cfg_name = name;
cfg_val = val;
if (strcmp(name, "update_path") == 0) {
strcopy(thePath, val, sizeof(thePath));
return;
}
}
int main(int argc, char **argv) {
u32 cookie;
FILE *exeFile;
FILE *exeFile = NULL;
void *exeBuffer = (void *)EXECUTABLE_MEM_ADDR;
int exeSize = 0;
u32 exeEntryPointAddress = 0;
entrypoint exeEntryPoint;
/* int videomod */
InitVideo();
@ -179,28 +104,34 @@ int main(int argc, char **argv) {
__io_wiisd.startup();
fatMount("SD", &__io_wiisd, 0, 32, 128);
/* write default path*/
snprintf(thePath, sizeof(thePath), "SD:/apps/usbloader_gx/");
// check to see if there is a path in the GXglobal file
snprintf(pathname, sizeof(pathname), "SD:/config/GXGlobal.cfg");
cfg_parsefile(pathname, &cfg_set);
//add boot.dol to our path
snprintf(pathname, sizeof(pathname), "%sboot.dol", thePath);
char cfgpath[40];
sprintf(cfgpath, "SD:/config/GXGlobal.cfg");
if(!cfg_parsefile(cfgpath, &cfg_set)) {
/* Open dol File and check exist */
exeFile = fopen (pathname ,"rb");
//boot.dol wasn't found. Try for the elf.
exeFile = fopen ("SD:/apps/usbloader_gx/boot.dol" ,"rb");
if (exeFile==NULL) {
fclose(exeFile);
snprintf(pathname, sizeof(pathname), "%sboot.elf", thePath);
exeFile = fopen (pathname ,"rb");
exeFile = fopen ("SD:/apps/usbloader_gx/boot.elf" ,"rb");
if (exeFile==NULL) {
fclose(exeFile);
SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
}
}
} else {
sprintf(cfgpath, "%sboot.dol", update_path);
/* Open dol File and check exist */
exeFile = fopen (cfgpath, "rb");
if (exeFile==NULL) {
fclose(exeFile);
sprintf(cfgpath, "%sboot.elf", update_path);
exeFile = fopen (cfgpath,"rb");
if (exeFile==NULL) {
fclose(exeFile);
SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
}
}
}
fseek (exeFile, 0, SEEK_END);
exeSize = ftell(exeFile);