XQF/xqf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve_path function for guess_dir etc

Browse Source 
git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@344 d2ac09be-c843-0410-8b1f-f8a84130e0ec
This commit is contained in:
Alex Burger 2002-10-29 14:46:55 +00:00 committed by alex_b
parent f1d7c7a7c1
commit 1b95be3b82
4 changed files with 98 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xqf/ChangeLog
View File

@ -1,3 +1,6 @@
Oct 29, 2002: Alex Burger <alex_b@users.sourceforge.net>
- Create resolve_path function for use with guess_dir, user_fix_defaults etc
Oct 29, 2002: Ludwig Nussel <l-n@users.sourceforge.net>
- add some missing gettext calls
- fix function casting to int*

148
xqf/src/pref.c
View File

@ -1829,91 +1829,20 @@ static GtkWidget *create_noskins_menu (int qworq2) {
static void pref_guess_dir(enum server_type type)
{
// Tries to guess the game / working directory using the following rules:
// - If cmd_entry is a symlink:
// - If pointed to file contains '..', just stop, otherwise strip filename and
// store as directory
// - If there is no /'s in the pointed to file, use the original cmd_entry instead and
// strip filename and store as directory
//
// - If cmd_entry is not a symlink:
// - strip filename and store as directory
//
// Examples:
//
// cmd_entry: /usr/bin/quake2 symlink to /games/quake2/quake2
// result dir: /games/quake2/
//
// cmd_entry: /usr/bin/quake symlink to ../../games/quake2/quake2
// result dir: (stops - leaves as-is)
//
// cmd_entry: /games/quake2/quake2
// result dir: /games/quake2/
//
// cmd_entry: quake2
// result dir: (stops - leaves as-is)
//
char *temp = NULL;
struct stat buf;
int length = 0;
char buf2[256];
char *ptr = NULL;
char *dir = NULL;
char *guessed_dir = NULL;
temp = g_strdup(gtk_entry_get_text (GTK_ENTRY (genprefs[type].cmd_entry)));
if (strcmp (temp, "")) {
lstat(temp, &buf);
if ( S_ISLNK(buf.st_mode) == 1) {
// Grab directory from sym link of cmd_entry
debug(1, "cmd_entry is a sym link");
length = readlink (temp, buf2, 255);
if (length){
buf2[length]='\0';
if(buf2[length-1] == '/')
buf2[length-1] = '\0';
ptr = strrchr(buf2, '/');
if (ptr) { // contains a / so pull from symlink
if (!strstr(buf2,"..")) { // don't bother if it's got any ..'s in it
dir = g_strndup(buf2, ptr-buf2+1);
gtk_entry_set_text (GTK_ENTRY (genprefs[type].dir_entry), dir);
}
}
else { // no / so pull from cmd_entry instead
ptr = strrchr(temp, '/');
if (ptr) { // contains a /
dir = g_strndup(temp, ptr-temp+1);
gtk_entry_set_text (GTK_ENTRY (genprefs[type].dir_entry), dir);
}
}
}
}
else {
// Grab directory from cmd_entry
debug(1,"cmd_entry is NOT a sym link");
ptr = strrchr(temp, '/');
if (ptr) { // contains a /
dir = g_strndup(temp, ptr-temp+1);
gtk_entry_set_text (GTK_ENTRY (genprefs[type].dir_entry), dir);
}
}
guessed_dir = resolve_path(temp);
if(guessed_dir)
gtk_entry_set_text (GTK_ENTRY (genprefs[type].dir_entry), guessed_dir);
}
else
dialog_ok (NULL, _("You must configure a command line first"));
if (temp)
g_free (temp);
if (dir)
g_free (dir);
}
@ -4308,15 +4237,11 @@ static void user_fix_defaults (void)
{
const char* files = NULL;
char* suggested_file = NULL;
char* guessed_dir = NULL;
char str[256];
int i;
int j = 0;
struct stat buf;
int length = 0;
char buf2[256];
char *ptr = NULL;
char *dir = NULL;
debug(1, "Setting defaults");
for (i = 0; i < GAMES_TOTAL; i++)
@ -4332,61 +4257,14 @@ static void user_fix_defaults (void)
config_set_string (str, suggested_file);
debug(1,"set command %s for %s",suggested_file,games[i].name);
// Working dir start
guessed_dir = resolve_path(suggested_file);
if(!guessed_dir) continue;
lstat(suggested_file, &buf);
if ( S_ISLNK(buf.st_mode) == 1) {
// Grab directory from sym link of suggested_file
debug(1, "suggested_file is a sym link");
length = readlink (suggested_file, buf2, 255);
if (length){
buf2[length]='\0';
if(buf2[length-1] == '/')
buf2[length-1] = '\0';
ptr = strrchr(buf2, '/');
if (ptr) { // contains a / so pull from symlink
if (!strstr(buf2,"..")) { // don't bother if it's got any ..'s in it
dir = g_strndup(buf2, ptr-buf2+1);
g_snprintf (str, 256, "/" CONFIG_FILE "/Game: %s/dir", type2id (games[i].type));
config_set_string (str, dir);
}
}
else { // no / so pull from suggest_file instead
ptr = strrchr(suggested_file, '/');
if (ptr) { // contains a /
dir = g_strndup(suggested_file, ptr-suggested_file+1);
g_snprintf (str, 256, "/" CONFIG_FILE "/Game: %s/dir", type2id (games[i].type));
config_set_string (str, dir);
}
}
}
}
else {
// Grab directory from suggested_file
debug(1,"suggested_file is NOT a sym link");
ptr = strrchr(suggested_file, '/');
if (ptr) { // contains a /
dir = g_strndup(suggested_file, ptr-suggested_file+1);
g_snprintf (str, 256, "/" CONFIG_FILE "/Game: %s/dir", type2id (games[i].type));
config_set_string (str, dir);
}
}
// Working dir end
if (dir)
g_free (dir);
g_free(suggested_file);
suggested_file=NULL;
g_snprintf (str, 256, "/" CONFIG_FILE "/Game: %s/dir", type2id (games[i].type));
config_set_string (str, guessed_dir);
debug(1,"set command %s for %s",guessed_dir,games[i].name);
}
if (j) {
config_set_string ("/" CONFIG_FILE "/Appearance/show only configured games","true");
debug(2,"%d games found, set 'show only configured games' to true", j);

80
xqf/src/utils.c
View File

@ -666,3 +666,83 @@ GSList* slist_sort_remove_dups(GSList* list, GCompareFunc compare_func, void (*u
return list;
}
char* resolve_path(const char* path)
{
// Extracts the path from path using the following rules:
// - If path is a symlink:
// - If pointed to file contains '..', just stop, otherwise strip filename and
// store as directory
// - If there is no /'s in the pointed to file, use the original cmd_entry instead and
// strip filename and store as directory
//
// - If path is not a symlink:
// - strip filename and store as directory
//
// Path can be either a file or a directory
//
// Examples:
//
// cmd_entry: /usr/bin/quake2 symlink to /games/quake2/quake2
// result dir: /games/quake2/
//
// cmd_entry: /usr/bin/quake symlink to ../../games/quake2/quake2
// result dir: (stops - leaves as-is)
//
// cmd_entry: /games/quake2/quake2
// result dir: /games/quake2/
//
// cmd_entry: quake2
// result dir: (stops - leaves as-is)
//
struct stat buf;
int length = 0;
char buf2[256];
char *ptr = NULL;
char *dir = NULL;
if (strcmp (path, "")) {
lstat(path, &buf);
if ( S_ISLNK(buf.st_mode) == 1) {
// Grab directory from sym link of cmd_entry
debug(2, "path is a sym link");
length = readlink (path, buf2, 255);
if (length){
buf2[length]='\0';
if(buf2[length-1] == '/')
buf2[length-1] = '\0';
ptr = strrchr(buf2, '/');
if (ptr) { // contains a / so pull from symlink
if (!strstr(buf2,"..")) { // don't bother if it's got any ..'s in it
dir = g_strndup(buf2, ptr-buf2+1);
}
}
else { // no / so pull from cmd_entry instead
ptr = strrchr(path, '/');
if (ptr) { // contains a /
dir = g_strndup(path, ptr-path+1);
}
}
}
}
else {
// Grab directory from cmd_entry
debug(2,"path is NOT a sym link");
ptr = strrchr(path, '/');
if (ptr) { // contains a /
dir = g_strndup(path, ptr-path+1);
}
}
}
return dir;
}

3
xqf/src/utils.h
View File

@ -57,9 +57,10 @@ extern int tokenize_bychar (char *str, char *token[], int max, char dlm);
extern int hostname_is_valid (const char *hostname);
extern char *find_game_dir (const char *basegamedir, const char *game,
extern char *find_game_dir (const char *basegamedir, const char *game,
int *match_result);
extern char* resolve_path(const char* path);
/*
Find a server setting from the info list in