system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 04:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

makedep: Remove the -R option.

Browse source
This commit is contained in:
Alexandre Julliard 2024-06-26 10:31:27 +02:00
parent 84d8a24af7
commit 29555a1fea
1 changed files with 4 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
tools/makedep.c
View file

@ -240,16 +240,14 @@ static const char *output_makefile_name = "Makefile";
static const char *input_file_name;
static const char *output_file_name;
static const char *temp_file_name;
static int relative_dir_mode;
static int silent_rules;
static int input_line;
static int output_column;
static FILE *output_file;
static const char Usage[] =
"Usage: makedep [options] [directories]\n"
"Usage: makedep [options]\n"
"Options:\n"
" -R from to Compute the relative path between two directories\n"
" -S Generate Automake-style silent rules\n"
" -fxxx Store output in file 'xxx' (default: Makefile)\n";
@ -493,52 +491,6 @@ static char *replace_substr( const char *str, const char *start, size_t len, con
}
/*******************************************************************
* get_relative_path
*
* Determine where the destination path is located relative to the 'from' path.
*/
static char *get_relative_path( const char *from, const char *dest )
{
const char *start;
char *ret, *p;
unsigned int dotdots = 0;
/* a path of "." is equivalent to an empty path */
if (!strcmp( from, "." )) from = "";
for (;;)
{
while (*from == '/') from++;
while (*dest == '/') dest++;
start = dest; /* save start of next path element */
if (!*from) break;
while (*from && *from != '/' && *from == *dest) { from++; dest++; }
if ((!*from || *from == '/') && (!*dest || *dest == '/')) continue;
/* count remaining elements in 'from' */
do
{
dotdots++;
while (*from && *from != '/') from++;
while (*from == '/') from++;
}
while (*from);
break;
}
if (!start[0] && !dotdots) return NULL; /* empty path */
ret = xmalloc( 3 * dotdots + strlen( start ) + 1 );
for (p = ret; dotdots; dotdots--, p += 3) memcpy( p, "../", 3 );
if (start[0]) strcpy( p, start );
else p[-1] = 0; /* remove trailing slash */
return ret;
}
/*******************************************************************
* get_root_relative_path
*
@ -4432,9 +4384,6 @@ static int parse_option( const char *opt )
case 'f':
if (opt[2]) output_makefile_name = opt + 2;
break;
case 'R':
relative_dir_mode = 1;
break;
case 'S':
silent_rules = 1;
break;
@ -4479,22 +4428,12 @@ int main( int argc, char *argv[] )
else i++;
}
if (relative_dir_mode)
if (argc > 1)
{
char *relpath;
if (argc != 3)
{
fprintf( stderr, "Option -R needs two directories\n%s", Usage );
exit( 1 );
}
relpath = get_relative_path( argv[1], argv[2] );
printf( "%s\n", relpath ? relpath : "." );
exit( 0 );
fprintf( stderr, "Unknown argument '%s'\n%s", argv[1], Usage );
exit(1);
}
if (argc > 1) fatal_error( "Directory arguments not supported in this mode\n" );
atexit( cleanup_files );
init_signals( exit_on_signal );