mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix for bug#5650 ('replace' does not follow symlinks)

Browse source 
fix now checks if the original (from) file is a symlink and uses the
link name. This prevents creation of a new file (and loss of symlink)
when renaming the tempfile.
This commit is contained in:
georg@lmy002.wdf.sap.corp 2005-07-26 07:41:32 +02:00
commit f09d06102a
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
extra/replace.c
View file

@ -1053,12 +1053,18 @@ static int convert_file(REPLACE *rep, my_string name)
int error; int error;
FILE *in,*out; FILE *in,*out;
char dir_buff[FN_REFLEN], tempname[FN_REFLEN]; char dir_buff[FN_REFLEN], tempname[FN_REFLEN];
char link_name[FN_REFLEN], *org_name = name;
File temp_file; File temp_file;
DBUG_ENTER("convert_file"); DBUG_ENTER("convert_file");
if (!(in=my_fopen(name,O_RDONLY,MYF(MY_WME)))) /* check if name is a symlink */
#ifdef HAVE_READLINK
org_name= (!my_disable_symlinks &&
!my_readlink(link_name, name, MYF(0))) ? link_name : name;
#endif
if (!(in= my_fopen(org_name,O_RDONLY,MYF(MY_WME))))
DBUG_RETURN(1); DBUG_RETURN(1);
dirname_part(dir_buff,name); dirname_part(dir_buff,org_name);
if ((temp_file= create_temp_file(tempname, dir_buff, "PR", O_WRONLY, if ((temp_file= create_temp_file(tempname, dir_buff, "PR", O_WRONLY,
MYF(MY_WME))) < 0) MYF(MY_WME))) < 0)
{ {
@ -1075,7 +1081,7 @@ static int convert_file(REPLACE *rep, my_string name)
my_fclose(in,MYF(0)); my_fclose(out,MYF(0)); my_fclose(in,MYF(0)); my_fclose(out,MYF(0));
if (updated && ! error) if (updated && ! error)
my_redel(name,tempname,MYF(MY_WME | MY_LINK_WARNING)); my_redel(org_name,tempname,MYF(MY_WME | MY_LINK_WARNING));
else else
my_delete(tempname,MYF(MY_WME)); my_delete(tempname,MYF(MY_WME));
if (!silent && ! error) if (!silent && ! error)