mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-30 23:21:08 +03:00
[PATCH] make symlink work properly if there is already a file in its place
If a file that is not a symlink (node, socket, fifo, etc) already exist where udev need to create a symlink, symlink() fails. This patch basically test for an existing file, and unlink it.
This commit is contained in:
parent
13148857cb
commit
3f09184b43
11
udev-add.c
11
udev-add.c
@ -100,6 +100,7 @@ static int create_path(char *file)
|
|||||||
|
|
||||||
static int create_node(struct udevice *dev)
|
static int create_node(struct udevice *dev)
|
||||||
{
|
{
|
||||||
|
struct stat stats;
|
||||||
char filename[255];
|
char filename[255];
|
||||||
char linktarget[255];
|
char linktarget[255];
|
||||||
char *linkname;
|
char *linkname;
|
||||||
@ -221,6 +222,16 @@ static int create_node(struct udevice *dev)
|
|||||||
strcpy(linktarget, "./");
|
strcpy(linktarget, "./");
|
||||||
strcat(linktarget, &dev->name[tail]);
|
strcat(linktarget, &dev->name[tail]);
|
||||||
|
|
||||||
|
/* unlink existing non-directories to ensure that our symlink
|
||||||
|
* is created */
|
||||||
|
if (lstat(filename, &stats) == 0) {
|
||||||
|
if ((stats.st_mode & S_IFMT) != S_IFDIR) {
|
||||||
|
if (unlink(filename))
|
||||||
|
dbg("unlink(%s) failed with error '%s'",
|
||||||
|
filename, strerror(errno));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dbg("symlink(%s, %s)", linktarget, filename);
|
dbg("symlink(%s, %s)", linktarget, filename);
|
||||||
retval = symlink(linktarget, filename);
|
retval = symlink(linktarget, filename);
|
||||||
if (retval)
|
if (retval)
|
||||||
|
Loading…
Reference in New Issue
Block a user