* file.c (make_symlink): Constify r.
Этот коммит содержится в:
родитель
26e400227a
Коммит
557dfdc7a1
@ -1,3 +1,7 @@
|
|||||||
|
2004-12-02 Andrew V. Samoilov <sav@bcs.zp.ua>
|
||||||
|
|
||||||
|
* file.c (make_symlink): Constify r.
|
||||||
|
|
||||||
2004-12-02 Leonard den Ottolander <leonard * den ottolander nl>
|
2004-12-02 Leonard den Ottolander <leonard * den ottolander nl>
|
||||||
|
|
||||||
* file.c (copy_dir_dir): Code cleanup (removal of unnecessary goto,
|
* file.c (copy_dir_dir): Code cleanup (removal of unnecessary goto,
|
||||||
|
11
src/file.c
11
src/file.c
@ -377,9 +377,9 @@ make_symlink (FileOpContext *ctx, const char *src_path, const char *dst_path)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (ctx->stable_symlinks && *link_target != PATH_SEP) {
|
if (ctx->stable_symlinks && *link_target != PATH_SEP) {
|
||||||
char *p, *q, *r, *s;
|
char *p, *q, *s;
|
||||||
|
|
||||||
r = strrchr (src_path, PATH_SEP);
|
const char *r = strrchr (src_path, PATH_SEP);
|
||||||
|
|
||||||
if (r) {
|
if (r) {
|
||||||
p = g_strndup (src_path, r - src_path);
|
p = g_strndup (src_path, r - src_path);
|
||||||
@ -387,9 +387,9 @@ make_symlink (FileOpContext *ctx, const char *src_path, const char *dst_path)
|
|||||||
q = g_strdup (dst_path);
|
q = g_strdup (dst_path);
|
||||||
else
|
else
|
||||||
q = g_strconcat (p, dst_path, (char *) NULL);
|
q = g_strconcat (p, dst_path, (char *) NULL);
|
||||||
r = strrchr (q, PATH_SEP);
|
s = strrchr (q, PATH_SEP);
|
||||||
if (r) {
|
if (s) {
|
||||||
r[1] = 0;
|
s[1] = 0;
|
||||||
s = g_strconcat (p, link_target, (char *) NULL);
|
s = g_strconcat (p, link_target, (char *) NULL);
|
||||||
g_free (p);
|
g_free (p);
|
||||||
g_strlcpy (link_target, s, sizeof (link_target));
|
g_strlcpy (link_target, s, sizeof (link_target));
|
||||||
@ -401,7 +401,6 @@ make_symlink (FileOpContext *ctx, const char *src_path, const char *dst_path)
|
|||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
g_free (p);
|
g_free (p);
|
||||||
|
|
||||||
g_free (q);
|
g_free (q);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user