From 1a88ebf767426b47faf2a88bb461bb1040d183b8 Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Sat, 17 Jan 1998 18:32:56 +0100
Subject: [PATCH] low_findprog checks for real files
Rev: lib/master.pike:1.62
Rev: lib/modules/Calendar.pmod/Swedish.pmod:1.2
---
lib/master.pike | 6 ++++--
lib/modules/Calendar.pmod/Swedish.pmod | 12 ++++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/lib/master.pike b/lib/master.pike
index 4fe9527183..dd11329e87 100644
--- a/lib/master.pike
+++ b/lib/master.pike
@@ -1,4 +1,4 @@
-/* $Id: master.pike,v 1.61 1998/01/17 01:05:20 hubbe Exp $
+/* $Id: master.pike,v 1.62 1998/01/17 17:32:55 mirar Exp $
*
* Master-file for Pike.
*/
@@ -183,9 +183,11 @@ mapping (string:program) programs=(["/master":object_program(this_object())]);
static program low_findprog(string pname, string ext)
{
program ret;
+ array s;
string fname=pname+ext;
if(ret=programs[fname]) return ret;
- if(master_file_stat(fname))
+ if( (s=master_file_stat(fname))
+ && s[1]>=0 )
{
switch(ext)
{
diff --git a/lib/modules/Calendar.pmod/Swedish.pmod b/lib/modules/Calendar.pmod/Swedish.pmod
index eb1f2470d1..b8f7cf1c06 100644
--- a/lib/modules/Calendar.pmod/Swedish.pmod
+++ b/lib/modules/Calendar.pmod/Swedish.pmod
@@ -20,3 +20,15 @@ class Week
return "v"+(string)this->number();
}
}
+
+class Year
+{
+ inherit Calendar.Gregorian.Year;
+
+ string name()
+ {
+ if (this->number()<=0)
+ return (string)(1-this->number())+" fk";
+ return (string)this->number();
+ }
+}
--
GitLab