3 files changed, 9 insertions, 6 deletions
diff --git a/runtime/staprun/common.c b/runtime/staprun/common.c
index 8200ec9d..26b166c2 100644
--- a/runtime/staprun/common.c
+++ b/runtime/staprun/common.c
@@ -82,7 +82,7 @@ int stap_strfloctime(char *buf, size_t max, const char *fmt, time_t t)
 			num = tm.tm_year % 100;
 			goto numbering02;
 		case 'C':
-			num = ((tm.tm_year + 1900 - 1) / 100) + 1;
+			num = ((tm.tm_year + 1900) / 100);
 			goto numbering;
 		case 'm':
 			num = tm.tm_mon + 1;
@@ -107,7 +107,7 @@ int stap_strfloctime(char *buf, size_t max, const char *fmt, time_t t)
 			if (num == 0) num = 12;
 			goto numbering02;
 		case 'j':
-			ret = snprintf(c, end - c, "%03d", tm.tm_yday);
+			ret = snprintf(c, end - c, "%03d", tm.tm_yday + 1);
 			if (ret < 0) return ret;
 			c += ret;
 			break;
@@ -117,7 +117,10 @@ int stap_strfloctime(char *buf, size_t max, const char *fmt, time_t t)
 		case 'l':
 			num = tm.tm_hour % 12;
 			if (num == 0) num = 12;
-			goto numbering;
+			ret = snprintf(c, end - c, "%2d", num);
+			if (ret < 0) return ret;
+			c += ret;
+			break;
 		case 'M':
 			num = tm.tm_min;
 			goto numbering02;
diff --git a/runtime/staprun/relay.c b/runtime/staprun/relay.c
index 50f295b5..694cb27e 100644
--- a/runtime/staprun/relay.c
+++ b/runtime/staprun/relay.c
@@ -200,7 +200,7 @@ static void *reader_thread(void *data)
 					perr("Couldn't open file for cpu %d, exiting.", cpu);
 					return(NULL);
 				}
-				wsize = 0;
+				wsize = rc;
 			}
 			if (write(out_fd[cpu], buf, rc) != rc) {
 				perr("Couldn't write to output %d for cpu %d, exiting.", out_fd[cpu], cpu);
diff --git a/runtime/staprun/relay_old.c b/runtime/staprun/relay_old.c
index ef8fd0da..469a5831 100644
--- a/runtime/staprun/relay_old.c
+++ b/runtime/staprun/relay_old.c
@@ -241,7 +241,7 @@ static int process_subbufs(struct _stp_buf_info *info,
 				perr("Couldn't open file for cpu %d, exiting.", cpu);
 				exit(1);
 			}
-			scb->wsize = 0;
+			scb->wsize = len;
 		}
 		if (len) {
 			if (fwrite_unlocked (subbuf_ptr, len, 1, percpu_tmpfile[cpu]) != 1) {
@@ -320,7 +320,7 @@ int write_realtime_data(void *data, ssize_t nb)
 			perr("Couldn't open file, exiting.");
 			return -1;
 		}
-		global_scb.wsize = 0;
+		global_scb.wsize = nb;
 	}
 	bw = write(out_fd[0], data, nb);
 	if (bw >= 0 && bw != nb) {