X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fbuiltin.c;h=9ed930c042eb4ca19b07165346cf5072c0c10f50;hp=5d9d7e42f00dd9574fd9548bd8b65a696cfaa889;hb=195175bc433f6b3167dc24d2c17ecea975a016e9;hpb=f9a22bf3b60ca02611f7040cd5dcde433849a09b

diff --git a/src/builtin.c b/src/builtin.c
index 5d9d7e4..9ed930c 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -45,9 +45,11 @@ static bool has_feature(struct psi_cpp *cpp, struct psi_token *target, struct ps
 static bool builtin_constant_p(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool BASE_FILE__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool COUNTER__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
+static bool DATE__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool FILE__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool INCLUDE_LEVEL__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool LINE__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
+static bool TIME__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool TIMESTAMP__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 
 static inline struct psi_plist *builtin_sig(token_t typ, ...)
@@ -109,9 +111,11 @@ PHP_MINIT_FUNCTION(psi_builtin)
 
 	PSI_BUILTIN(BASE_FILE__, -1);
 	PSI_BUILTIN(COUNTER__, -1);
+	PSI_BUILTIN(DATE__, -1);
 	PSI_BUILTIN(FILE__, -1);
 	PSI_BUILTIN(INCLUDE_LEVEL__, -1);
 	PSI_BUILTIN(LINE__, -1);
+	PSI_BUILTIN(TIME__, -1);
 	PSI_BUILTIN(TIMESTAMP__, -1);
 
 	return SUCCESS;
@@ -214,7 +218,7 @@ static bool builtin_constant_p(struct psi_cpp *cpp, struct psi_token *target,
 #define ADD_UNSIGNED_NUMBER(u) do { \
 	char buf[0x20]; \
 	unsigned u_ = u; \
-	size_t len = sprintf(buf, "%u", u_); \
+	size_t len = snprintf(buf, sizeof(buf), "%u", u_); \
 	struct psi_token *tok_ = NEW_TOKEN(PSI_T_NUMBER, buf, len); \
 	tok_->flags |= PSI_NUMBER_INT | PSI_NUMBER_U; \
 	ADD_TOKEN(tok_); \
@@ -234,6 +238,24 @@ static bool COUNTER__(struct psi_cpp *cpp, struct psi_token *target,
 	return true;
 }
 
+static bool DATE__(struct psi_cpp *cpp, struct psi_token *target,
+		struct psi_plist **args, struct psi_plist **res)
+{
+	char buf[12];
+	struct tm *tp;
+	time_t t = time(NULL);
+#if HAVE_LOCALTIME_R
+	struct tm tm = {0};
+	tp = localtime_r(&t, &tm);
+#else
+	tp = localtime(&t);
+#endif
+
+	strftime(buf, sizeof(buf), "%b %e %Y", tp);
+	ADD_QUOTED_STRING(buf, 11);
+	return true;
+}
+
 static bool FILE__(struct psi_cpp *cpp, struct psi_token *target,
 		struct psi_plist **args, struct psi_plist **res)
 {
@@ -255,6 +277,24 @@ static bool LINE__(struct psi_cpp *cpp, struct psi_token *target,
 	return true;
 }
 
+static bool TIME__(struct psi_cpp *cpp, struct psi_token *target,
+		struct psi_plist **args, struct psi_plist **res)
+{
+	char buf[9];
+	struct tm *tp;
+	time_t t = time(NULL);
+#if HAVE_LOCALTIME_R
+	struct tm tm = {0};
+	tp = localtime_r(&t, &tm);
+#else
+	tp = localtime(&t);
+#endif
+
+	strftime(buf, sizeof(buf), "%H:%M:%S", tp);
+	ADD_QUOTED_STRING(buf, 8);
+	return true;
+}
+
 static bool TIMESTAMP__(struct psi_cpp *cpp, struct psi_token *target,
 		struct psi_plist **args, struct psi_plist **res)
 {