Add ln(1) target directory support.
This commit is contained in:
parent
63d42cd686
commit
4333b2e695
18
utils/ln.cpp
18
utils/ln.cpp
|
@ -23,6 +23,7 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <error.h>
|
#include <error.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <libgen.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -60,6 +61,7 @@ int main(int argc, char* argv[])
|
||||||
const char* argv0 = argv[0];
|
const char* argv0 = argv[0];
|
||||||
bool force = false;
|
bool force = false;
|
||||||
bool symbolic = false;
|
bool symbolic = false;
|
||||||
|
bool no_target_directory = false;
|
||||||
bool verbose = false;
|
bool verbose = false;
|
||||||
for ( int i = 1; i < argc; i++ )
|
for ( int i = 1; i < argc; i++ )
|
||||||
{
|
{
|
||||||
|
@ -75,6 +77,7 @@ int main(int argc, char* argv[])
|
||||||
{
|
{
|
||||||
case 'f': force = true; break;
|
case 'f': force = true; break;
|
||||||
case 's': symbolic = true; break;
|
case 's': symbolic = true; break;
|
||||||
|
case 'T': no_target_directory = true; break;
|
||||||
case 'v': verbose = true; break;
|
case 'v': verbose = true; break;
|
||||||
default:
|
default:
|
||||||
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
|
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
|
||||||
|
@ -108,15 +111,30 @@ int main(int argc, char* argv[])
|
||||||
const char* oldname = argv[1];
|
const char* oldname = argv[1];
|
||||||
const char* newname = argv[2];
|
const char* newname = argv[2];
|
||||||
|
|
||||||
|
bool done = false;
|
||||||
|
again:
|
||||||
if ( force )
|
if ( force )
|
||||||
unlink(newname);
|
unlink(newname);
|
||||||
|
|
||||||
|
struct stat st;
|
||||||
int ret = (symbolic ? symlink : link)(oldname, newname);
|
int ret = (symbolic ? symlink : link)(oldname, newname);
|
||||||
if ( ret == 0 )
|
if ( ret == 0 )
|
||||||
{
|
{
|
||||||
if ( verbose )
|
if ( verbose )
|
||||||
printf("`%s' => `%s'\n", newname, oldname);
|
printf("`%s' => `%s'\n", newname, oldname);
|
||||||
}
|
}
|
||||||
|
else if ( !done && errno == EEXIST && !no_target_directory &&
|
||||||
|
lstat(newname, &st) == 0 && S_ISDIR(st.st_mode) )
|
||||||
|
{
|
||||||
|
char* oldnamecopy = strdup(oldname);
|
||||||
|
const char* name = basename(oldnamecopy);
|
||||||
|
char* newnewname;
|
||||||
|
asprintf(&newnewname, "%s/%s", newname, name);
|
||||||
|
free(oldnamecopy);
|
||||||
|
newname = newnewname;
|
||||||
|
done = true;
|
||||||
|
goto again;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
error(0, errno, "`%s' => `%s'", newname, oldname);
|
error(0, errno, "`%s' => `%s'", newname, oldname);
|
||||||
return ret ? 1 : 0;
|
return ret ? 1 : 0;
|
||||||
|
|
Loading…
Reference in New Issue