Deleted Added
full compact
archive_read_disk_entry_from_file.c (346104) archive_read_disk_entry_from_file.c (348607)
1/*-
2 * Copyright (c) 2003-2009 Tim Kientzle
3 * Copyright (c) 2010-2012 Michihiro NAKAJIMA
4 * Copyright (c) 2016 Martin Matuska
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 177 unchanged lines hidden (view full) ---

186 if (!a->follow_symlinks) {
187 if (lstat(path, &s) != 0) {
188 archive_set_error(&a->archive, errno,
189 "Can't lstat %s", path);
190 return (ARCHIVE_FAILED);
191 }
192 } else
193#endif
1/*-
2 * Copyright (c) 2003-2009 Tim Kientzle
3 * Copyright (c) 2010-2012 Michihiro NAKAJIMA
4 * Copyright (c) 2016 Martin Matuska
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 177 unchanged lines hidden (view full) ---

186 if (!a->follow_symlinks) {
187 if (lstat(path, &s) != 0) {
188 archive_set_error(&a->archive, errno,
189 "Can't lstat %s", path);
190 return (ARCHIVE_FAILED);
191 }
192 } else
193#endif
194 if (stat(path, &s) != 0) {
194 if (la_stat(path, &s) != 0) {
195 archive_set_error(&a->archive, errno,
196 "Can't stat %s", path);
197 return (ARCHIVE_FAILED);
198 }
199 st = &s;
200 }
201 archive_entry_copy_stat(entry, st);
202 }

--- 830 unchanged lines hidden ---
195 archive_set_error(&a->archive, errno,
196 "Can't stat %s", path);
197 return (ARCHIVE_FAILED);
198 }
199 st = &s;
200 }
201 archive_entry_copy_stat(entry, st);
202 }

--- 830 unchanged lines hidden ---