diff options
| -rw-r--r-- | site/2025.html | 2 | ||||
| -rw-r--r-- | site/about.html | 2 | ||||
| -rw-r--r-- | site/audio.html | 2 | ||||
| -rw-r--r-- | site/gsix.html | 2 | ||||
| -rw-r--r-- | site/hokkaido.html | 2 | ||||
| -rw-r--r-- | site/ibaraki.html | 2 | ||||
| -rw-r--r-- | site/index.html | 2 | ||||
| -rw-r--r-- | site/japan.html | 2 | ||||
| -rw-r--r-- | site/kamakura.html | 2 | ||||
| -rw-r--r-- | site/like.html | 2 | ||||
| -rw-r--r-- | site/niigata.html | 2 | ||||
| -rw-r--r-- | site/nikko.html | 2 | ||||
| -rw-r--r-- | site/notes.html | 2 | ||||
| -rw-r--r-- | site/pyonji.html | 2 | ||||
| -rw-r--r-- | site/shikoku.html | 2 | ||||
| -rw-r--r-- | site/toyama.html | 2 | ||||
| -rw-r--r-- | site/yamanashi.html | 2 | ||||
| -rw-r--r-- | src/fs.zig | 15 | ||||
| -rw-r--r-- | src/gen.zig | 13 |
19 files changed, 31 insertions, 31 deletions
diff --git a/site/2025.html b/site/2025.html index 6bb2090..051de58 100644 --- a/site/2025.html +++ b/site/2025.html @@ -208,7 +208,7 @@ target="_blank">fixed</a> an aerc stylesheet bug</li> </ul> </main> <footer> -Edited on 2025-10-17 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/2025.htm" target="_blank">[src]</a> +Edited on 2025-10-06 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/2025.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/about.html b/site/about.html index 982fba3..ca6d038 100644 --- a/site/about.html +++ b/site/about.html @@ -48,7 +48,7 @@ </details> </main> <footer> -Edited on 2025-09-24 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/about.htm" target="_blank">[src]</a> +Edited on 2025-01-13 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/about.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/audio.html b/site/audio.html index f581a58..f1cbdce 100644 --- a/site/audio.html +++ b/site/audio.html @@ -61,7 +61,7 @@ </div> </main> <footer> -Edited on 2025-09-24 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/audio.htm" target="_blank">[src]</a> +Edited on 2025-05-12 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/audio.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/gsix.html b/site/gsix.html index ef01523..6ff1dae 100644 --- a/site/gsix.html +++ b/site/gsix.html @@ -37,7 +37,7 @@ </section> </main> <footer> -Edited on 2025-03-03 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/gsix.htm" target="_blank">[src]</a> +Edited on 2025-03-07 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/gsix.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/hokkaido.html b/site/hokkaido.html index fa41471..a5ec2a5 100644 --- a/site/hokkaido.html +++ b/site/hokkaido.html @@ -46,7 +46,7 @@ </ul> </main> <footer> -Edited on 2025-09-10 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/hokkaido.htm" target="_blank">[src]</a> +Edited on 2024-10-16 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/hokkaido.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/ibaraki.html b/site/ibaraki.html index 6c2f239..906a5d8 100644 --- a/site/ibaraki.html +++ b/site/ibaraki.html @@ -48,7 +48,7 @@ </ul> </main> <footer> -Edited on 2025-01-07 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/ibaraki.htm" target="_blank">[src]</a> +Edited on 2024-10-16 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/ibaraki.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/index.html b/site/index.html index 4efbe91..006cb55 100644 --- a/site/index.html +++ b/site/index.html @@ -60,7 +60,7 @@ </ul> </main> <footer> -Edited on 2025-04-27 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/index.htm" target="_blank">[src]</a> +Edited on 2025-06-09 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/index.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/japan.html b/site/japan.html index 74f154c..cdc1055 100644 --- a/site/japan.html +++ b/site/japan.html @@ -57,7 +57,7 @@ </ul> </main> <footer> -Edited on 2025-09-24 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/japan.htm" target="_blank">[src]</a> +Edited on 2025-01-02 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/japan.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/kamakura.html b/site/kamakura.html index b8db251..a930f05 100644 --- a/site/kamakura.html +++ b/site/kamakura.html @@ -124,7 +124,7 @@ href="#fnref3" class="footnote-back" role="doc-backlink">↩︎</a></p></li> </section> </main> <footer> -Edited on 2025-09-24 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/kamakura.htm" target="_blank">[src]</a> +Edited on 2025-06-09 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/kamakura.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/like.html b/site/like.html index 1047c7d..ac6c92a 100644 --- a/site/like.html +++ b/site/like.html @@ -68,7 +68,7 @@ target="_blank"><sup>[?]</sup></a></span></p> </blockquote> </main> <footer> -Edited on 2025-10-07 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/like.htm" target="_blank">[src]</a> +Edited on 2025-10-06 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/like.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/niigata.html b/site/niigata.html index d50eaec..3744f3a 100644 --- a/site/niigata.html +++ b/site/niigata.html @@ -52,7 +52,7 @@ </ul> </main> <footer> -Edited on 2025-01-07 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/niigata.htm" target="_blank">[src]</a> +Edited on 2024-10-16 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/niigata.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/nikko.html b/site/nikko.html index 2dcf6bb..8cd8dc1 100644 --- a/site/nikko.html +++ b/site/nikko.html @@ -234,7 +234,7 @@ href="#fnref5" class="footnote-back" role="doc-backlink">↩︎</a></p></li> </section> </main> <footer> -Edited on 2025-02-13 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/nikko.htm" target="_blank">[src]</a> +Edited on 2025-02-26 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/nikko.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/notes.html b/site/notes.html index 423dbfe..1f0d01b 100644 --- a/site/notes.html +++ b/site/notes.html @@ -42,7 +42,7 @@ </ul> </main> <footer> -Edited on 2025-10-07 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/notes.htm" target="_blank">[src]</a> +Edited on 2025-10-06 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/notes.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/pyonji.html b/site/pyonji.html index e05bf59..105deb2 100644 --- a/site/pyonji.html +++ b/site/pyonji.html @@ -67,7 +67,7 @@ href="https://git.sr.ht/~robertgzr/pyonji/log/devel" class="uri" target="_blank">https://git.sr.ht/~robertgzr/pyonji/log/devel</a></p> </main> <footer> -Edited on 2025-08-11 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/pyonji.htm" target="_blank">[src]</a> +Edited on 2025-07-25 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/pyonji.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/shikoku.html b/site/shikoku.html index 2e43990..34ed94b 100644 --- a/site/shikoku.html +++ b/site/shikoku.html @@ -48,7 +48,7 @@ </ul> </main> <footer> -Edited on 2025-01-07 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/shikoku.htm" target="_blank">[src]</a> +Edited on 2024-10-16 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/shikoku.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/toyama.html b/site/toyama.html index 81000f0..8998f20 100644 --- a/site/toyama.html +++ b/site/toyama.html @@ -54,7 +54,7 @@ </ul> </main> <footer> -Edited on 2025-01-07 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/toyama.htm" target="_blank">[src]</a> +Edited on 2024-10-16 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/toyama.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/site/yamanashi.html b/site/yamanashi.html index aeb71dd..f548393 100644 --- a/site/yamanashi.html +++ b/site/yamanashi.html @@ -71,7 +71,7 @@ </ul> </main> <footer> -Edited on 2025-01-07 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/yamanashi.htm" target="_blank">[src]</a> +Edited on 2024-10-16 <a href="https://git.sr.ht/~robertgzr/site/tree/master/src/inc/yamanashi.htm" target="_blank">[src]</a> <a href="mailto:~robertgzr/public-inbox@lists.sr.ht">[comments]</a> <br> <b>robertgzr</b> diff --git a/src/fs.zig b/src/fs.zig index adcd0c3..8eaf7c2 100644 --- a/src/fs.zig +++ b/src/fs.zig @@ -127,20 +127,19 @@ pub fn stripExtension(path: []const u8) ![]const u8 { } pub fn joinPathAndFilename(alloc: std.mem.Allocator, paths: []const []const u8, filename_parts: []const []const u8) ![]const u8 { - const filename = try std.mem.concat(alloc, u8, filename_parts); - defer alloc.free(filename); + var buf: [std.os.linux.PATH_MAX]u8 = undefined; + var fba = std.heap.FixedBufferAllocator.init(&buf); - var p = try std.ArrayList([]const u8).initCapacity(alloc, paths.len + 1); + const filename = try std.mem.concat(fba.allocator(), u8, filename_parts); + + var p = try std.ArrayList([]const u8).initCapacity(fba.allocator(), paths.len + 1); defer p.deinit(); p.appendSliceAssumeCapacity(paths); p.appendAssumeCapacity(filename); - const paths2 = try p.toOwnedSlice(); - defer alloc.free(paths2); - - std.debug.assert(paths.len + 1 == paths2.len); - return try std.fs.path.join(alloc, paths2); + std.debug.assert(paths.len + 1 == p.items.len); + return try std.fs.path.join(alloc, p.items); } pub fn getGitTime(path: []const u8) !std.posix.timespec { diff --git a/src/gen.zig b/src/gen.zig index 4b9735d..2a01590 100644 --- a/src/gen.zig +++ b/src/gen.zig @@ -6,6 +6,9 @@ const fs = @import("fs.zig"); const exe = @import("exe.zig"); pub fn fixMtimes(ctx: *Context) !void { + var buf: [2 * std.os.linux.PATH_MAX]u8 = undefined; + var fba = std.heap.FixedBufferAllocator.init(&buf); + ctx.progress_start("Fix mtimes"); defer ctx.progress_end(); @@ -14,13 +17,11 @@ pub fn fixMtimes(ctx: *Context) !void { ctx.progress_start(p); defer ctx.progress_end(); - const path = try fs.joinPathAndFilename(ctx.allocator(), &.{Context.params.PAGE_PATH}, &.{p}); - defer ctx.allocator().free(path); - - const mdpath = try fs.replaceExtension(ctx.allocator(), p, "md"); - defer ctx.allocator().free(mdpath); + const path = try fs.joinPathAndFilename(fba.allocator(), &.{Context.params.PAGE_PATH}, &.{p}); + const mdpath = try fs.replaceExtension(fba.allocator(), path, "md"); + defer fba.reset(); - std.fs.cwd().access(mdpath, .{ .mode = .read_only }) catch { + std.fs.cwd().access(mdpath, .{}) catch { // only set mtime from git if no markdown source is used const ts = fs.getGitTime(path) catch continue; try fs.setMtime(path, ts); |