Mercurial > gub

annotate patches/guile-1.9.15-mingw-rename.patch @ 6491:371a49e82001

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mingw::guile: update rename patch.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Tue, 08 Feb 2011 12:32:52 +0100
parents 840b403f7762
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6489
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
1 --- guile-1.9.15/libguile/filesys.c.orig 2011-02-07 12:07:09.984516150 +0100
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
2 +++ guile-1.9.15/libguile/filesys.c 2011-02-07 12:11:53.627350574 +0100
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
3 @@ -680,9 +680,10 @@ SCM_DEFINE (scm_link, "link", 2, 0, 0,
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
4 #undef FUNC_NAME
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
5 #endif /* HAVE_LINK */
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
6
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
7 -#ifdef HAVE_RENAME
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
8 +#if defined (HAVE_RENAME) && !defined (__MINGW32__)
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
9 #define my_rename rename
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
10 -#else
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
11 +#else /* !HAVE_RENAME || __MINGW32__ */
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
12 +#ifndef __MINGW32__
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
13 static int
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
14 my_rename (const char *oldname, const char *newname)
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
15 {
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
16 @@ -698,7 +699,24 @@ my_rename (const char *oldname, const ch
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
17 }
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
18 return rv;
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
19 }
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
20 -#endif
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
21 +#else /* __MINGW32__ */
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
22 +static int
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
23 +my_rename (const char *oldname, const char *newname)
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
24 +{
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
25 + int rv;
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
26 + struct stat stat;
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
27 +
6491
371a49e82001 mingw::guile: update rename patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents: 6489
diff changeset
28 + SCM_SYSCALL (rv = !stat (newname, &stat));
371a49e82001 mingw::guile: update rename patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents: 6489
diff changeset
29 + if (rv != 0)
6489
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
30 + SCM_SYSCALL (rv = unlink (newname));
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
31 + if (rv == 0)
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
32 + rv = rename (oldname, newname);
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
33 +
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
34 + return rv;
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
35 +}
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
36 +#endif /* __MINGW32__ */
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
37 +#endif /* !HAVE_RENAME || __MINGW32__ */
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
38 +
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
39
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
40 SCM_DEFINE (scm_rename, "rename-file", 2, 0, 0,
840b403f7762 mingw::guile: another round of 1.9 patches.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
41 (SCM oldname, SCM newname),