github/amiga-clib2
1
0
Fork 0
mirror of https://github.com/adtools/clib2.git synced 2025-12-08 14:59:05 +00:00
Code Issues Releases Wiki Activity

- Added experimental tilde expansion in Unix path names. This still needs

Browse Source 
some more work.


git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@15159 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
Olaf Barthel
2006-10-03 16:36:47 +00:00
parent 591ee2250e
commit 6809a5dd5b
2 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/changes
View File

@ -1,3 +1,6 @@
- Added experimental tilde expansion in Unix path names. This still needs
some more work.
- __get_default_file() called __fd_unlock() without having called
__fd_lock() first. Ouch.

54
library/unistd_translateu2a.c
View File

@ -1,5 +1,5 @@
/*
* $Id: unistd_translateu2a.c,v 1.10 2006-01-08 12:04:27 obarthel Exp $
* $Id: unistd_translateu2a.c,v 1.11 2006-10-03 16:36:47 obarthel Exp $
*
* :ts=4
*
@ -90,6 +90,7 @@ __translate_unix_to_amiga_path_name(char const ** name_ptr,struct name_translati
perform the translation and substitution. */
if(strchr(name,':') == NULL)
{
char home_dir_name[sizeof(nti->substitute)];
char volume_name[sizeof(nti->substitute)];
size_t volume_name_len;
char * replace = nti->substitute;
@ -107,6 +108,49 @@ __translate_unix_to_amiga_path_name(char const ** name_ptr,struct name_translati
D(("initial name = '%s'",name));
/* If the first character of the path name is a tilde, then the
path should be relative to the user's home directory. */
if(name[0] == '~' && 0)
{
LONG home_dir_name_len;
/* If the HOME environment variable is set, it is supposed to refer
to the name of the directory that will replace the tilde
character. This should be a Unix-style path name and not
something that makes life harder by being an Amiga path name.
Absolute Amiga path names are ignore, as is the absence of
the HOME variable. */
home_dir_name_len = GetVar("HOME",(STRPTR)home_dir_name,(LONG)sizeof(home_dir_name),0);
if(home_dir_name_len <= 0 || strchr(home_dir_name,':') != NULL)
{
/* Nothing useful here. Replace the tilde with the
current directory. */
strcpy(home_dir_name,".");
home_dir_name_len = 1;
}
/* Will this fit? */
if(len + home_dir_name_len >= sizeof(nti->substitute))
{
__set_errno(ENAMETOOLONG);
goto out;
}
/* Add a path separator unless it's already there. */
if(home_dir_name[home_dir_name_len-1] != '/')
home_dir_name[home_dir_name_len++] = '/';
/* Skip the tilde and any path name separators that may follow it. */
name++;
while((*name) == '/')
name++;
/* Now combine the home directory name with the remainder
of the path name. */
strcpy(&home_dir_name[home_dir_name_len],name);
name = home_dir_name;
}
/* Prepend an absolute path to the name, if such a path was previously set
as the current directory. */
if(__translate_relative_path_name((const char **)&name,nti->substitute,sizeof(nti->substitute)) < 0)
@ -115,6 +159,14 @@ __translate_unix_to_amiga_path_name(char const ** name_ptr,struct name_translati
goto out;
}
/* If we wound up with the expanded home directory name,
put it into the substitution string. */
if(name == home_dir_name)
{
strcpy(replace,home_dir_name);
name = replace;
}
/*<2A>If the name was replaced, update the string length cached. */
if(name != (*name_ptr))
{