root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Better fixes for OpenVMS support. 

Thanks to Jouk Jansen.
This commit is contained in:
Lasse Collin 2009-09-22 14:03:02 +03:00
parent 4c3630ec41
commit 932b2e2044
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/xz/file_io.c
View File

@ -72,7 +72,7 @@ io_init(void)
static void static void
io_unlink(const char *name, const struct stat *known_st) io_unlink(const char *name, const struct stat *known_st)
{ {
#if defined(TUKLIB_DOSLIKE) || defined(__VMS) #if defined(TUKLIB_DOSLIKE)
// On DOS-like systems, st_ino is meaningless, so don't bother // On DOS-like systems, st_ino is meaningless, so don't bother
// testing it. Just silence a compiler warning. // testing it. Just silence a compiler warning.
(void)known_st; (void)known_st;
@ -80,8 +80,17 @@ io_unlink(const char *name, const struct stat *known_st)
struct stat new_st; struct stat new_st;
if (lstat(name, &new_st) if (lstat(name, &new_st)
# ifdef __VMS
// st_ino is an array, and we don't want to
// compare st_dev at all.
|| memcmp(&new_st.st_ino, &known_st.st_ino,
sizeof(new_st.st_ino)) != 0
# else
// Typical POSIX-like system
|| new_st.st_dev != known_st->st_dev || new_st.st_dev != known_st->st_dev
|| new_st.st_ino != known_st->st_ino) || new_st.st_ino != known_st->st_ino
# endif
)
message_error(_("%s: File seems to be moved, not removing"), message_error(_("%s: File seems to be moved, not removing"),
name); name);
else else
@ -529,8 +538,12 @@ io_open_dest(file_pair *pair)
// If this really fails... well, we have a safe fallback. // If this really fails... well, we have a safe fallback.
if (fstat(pair->dest_fd, &pair->dest_st)) { if (fstat(pair->dest_fd, &pair->dest_st)) {
#if defined(__VMS)
pair->dest_st.st_ino[0] = 0;
pair->dest_st.st_ino[1] = 0;
pair->dest_st.st_ino[2] = 0;
#elif !defined(TUKLIB_DOSLIKE)
pair->dest_st.st_dev = 0; pair->dest_st.st_dev = 0;
#ifndef __VMS
pair->dest_st.st_ino = 0; pair->dest_st.st_ino = 0;
#endif #endif
} }