mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-18 03:11:15 +02:00
Code Releases Activity

42365: Use .zwc file if timestamp identical to source.

Browse source 
This can happen if the files are bundled together.
This commit is contained in:
Martijn Dekker 2018-02-14 07:11:14 +01:00 committed by Peter Stephenson
parent 14c17aa178
commit 54ea6a8cd5
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2018-03-05 Peter Stephenson <p.stephenson@samsung.com>
* Martijn: 42365: Src/parse.c: use .zwc file if timestamp
identical to source file.
2018-03-04 Peter Stephenson <p.w.stephenson@ntlworld.com> 2018-03-04 Peter Stephenson <p.w.stephenson@ntlworld.com>
* Taylor West: 42411: Src/mem.c: assume any current C compiler * Taylor West: 42411: Src/mem.c: assume any current C compiler

8
Src/parse.c
View file

@ -3677,15 +3677,15 @@ try_dump_file(char *path, char *name, char *file, int *ksh, int test_only)
* function. */ * function. */
queue_signals(); queue_signals();
if (!rd && if (!rd &&
(rc || std.st_mtime > stc.st_mtime) && (rc || std.st_mtime >= stc.st_mtime) &&
(rn || std.st_mtime > stn.st_mtime) && (rn || std.st_mtime >= stn.st_mtime) &&
(prog = check_dump_file(dig, &std, name, ksh, test_only))) { (prog = check_dump_file(dig, &std, name, ksh, test_only))) {
unqueue_signals(); unqueue_signals();
return prog; return prog;
} }
/* No digest file. Now look for the per-function compiled file. */ /* No digest file. Now look for the per-function compiled file. */
if (!rc && if (!rc &&
(rn || stc.st_mtime > stn.st_mtime) && (rn || stc.st_mtime >= stn.st_mtime) &&
(prog = check_dump_file(wc, &stc, name, ksh, test_only))) { (prog = check_dump_file(wc, &stc, name, ksh, test_only))) {
unqueue_signals(); unqueue_signals();
return prog; return prog;
@ -3724,7 +3724,7 @@ try_source_file(char *file)
rn = stat(file, &stn); rn = stat(file, &stn);
queue_signals(); queue_signals();
if (!rc && (rn || stc.st_mtime > stn.st_mtime) && if (!rc && (rn || stc.st_mtime >= stn.st_mtime) &&
(prog = check_dump_file(wc, &stc, tail, NULL, 0))) { (prog = check_dump_file(wc, &stc, tail, NULL, 0))) {
unqueue_signals(); unqueue_signals();
return prog; return prog;