Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

patch: don't trash permissions of patched file

Browse Source
This commit is contained in:
Denis Vlasenko 2008-03-18 01:38:04 +00:00
parent d7e6af2dda
commit 2a7a451391
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editors/patch.c
View File

@ -71,12 +71,6 @@ static char *extract_filename(char *line, int patch_level)
return xstrdup(filename_start_ptr); return xstrdup(filename_start_ptr);
} }
static int file_doesnt_exist(const char *filename)
{
struct stat statbuf;
return stat(filename, &statbuf);
}
int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int patch_main(int argc ATTRIBUTE_UNUSED, char **argv) int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
{ {
@ -84,7 +78,8 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
char *patch_line; char *patch_line;
int ret; int ret;
FILE *patch_file = NULL; FILE *patch_file = NULL;
struct stat saved_stat;
{ {
char *p, *i; char *p, *i;
ret = getopt32(argv, "p:i:", &p, &i); ret = getopt32(argv, "p:i:", &p, &i);
@ -134,8 +129,9 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
} }
new_filename = extract_filename(patch_line, patch_level); new_filename = extract_filename(patch_line, patch_level);
free(patch_line); free(patch_line);
if (file_doesnt_exist(new_filename)) { /* Get access rights from the file to be patched, -1 file does not exist */
if (stat(new_filename, &saved_stat)) {
char *line_ptr; char *line_ptr;
/* Create leading directories */ /* Create leading directories */
line_ptr = strrchr(new_filename, '/'); line_ptr = strrchr(new_filename, '/');
@ -152,9 +148,10 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
strcat(backup_filename, ".orig"); strcat(backup_filename, ".orig");
xrename(new_filename, backup_filename); xrename(new_filename, backup_filename);
dst_stream = xfopen(new_filename, "w"); dst_stream = xfopen(new_filename, "w");
fchmod(fileno(dst_stream), saved_stat.st_mode);
} }
if ((backup_filename == NULL) || file_doesnt_exist(original_filename)) { if ((backup_filename == NULL) || stat(original_filename, &saved_stat)) {
src_stream = NULL; src_stream = NULL;
} else { } else {
if (strcmp(original_filename, new_filename) == 0) { if (strcmp(original_filename, new_filename) == 0) {