tarsync-0.2.1-gcc5.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960
  1. diff --git a/excludes.c b/excludes.c
  2. index b7c928d..fa43cef 100644
  3. --- a/excludes.c
  4. +++ b/excludes.c
  5. @@ -106,7 +106,7 @@ build_exclude(fnm_exclude **ex_ptr, const char *pattern)
  6. }
  7. -inline int
  8. +int
  9. match_excludes(const char *dir, const char *file, fnm_exclude **excludes)
  10. {
  11. char *p;
  12. diff --git a/main.c b/main.c
  13. index 84feed4..2c2da3e 100644
  14. --- a/main.c
  15. +++ b/main.c
  16. @@ -42,8 +42,8 @@ int remove_node(const char *path, struct stat *st);
  17. int ensure_files_layout(const tar_entry **ttar, const unsigned int ttar_count, tar_entry ***missing,
  18. unsigned int *missing_count, tar_entry ***existing, unsigned int *existing_count,
  19. fnm_exclude **excludes);
  20. -inline int check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st);
  21. -inline int enforce_owner(const char *path, const tar_entry *t, struct stat *st);
  22. +int check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st);
  23. +int enforce_owner(const char *path, const tar_entry *t, struct stat *st);
  24. int copy_whole_file(cfile *tar_cfh, const tar_entry *ttent);
  25. static int check_mtime = 1;
  26. @@ -669,7 +669,7 @@ recursively_delete_dir(const char *path)
  27. return ret;
  28. }
  29. -inline int
  30. +int
  31. check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st)
  32. {
  33. int type;
  34. @@ -685,7 +685,7 @@ check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st
  35. return 0;
  36. }
  37. -inline int
  38. +int
  39. enforce_owner(const char *path, const tar_entry *t, struct stat *st)
  40. {
  41. struct stat st2;
  42. diff --git a/tar.c b/tar.c
  43. index 792ccd4..42dc8e7 100644
  44. --- a/tar.c
  45. +++ b/tar.c
  46. @@ -40,7 +40,7 @@ int check_str_chksum(const char *block)
  47. /* possibly this could be done different, what of endptr of strtol?
  48. Frankly I worry about strtol trying to go too far and causing a segfault, due to tar fields not always having trailing \0 */
  49. -inline unsigned long octal_str2long(const char *string, unsigned int length)
  50. +unsigned long octal_str2long(const char *string, unsigned int length)
  51. {
  52. if(string[length]) {
  53. char *ptr = strndup(string, length);