From 9b3a2d96e3b7246536c36480d400917b904e5f2a Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Mon, 7 Aug 2023 03:42:11 -0400 Subject: [PATCH] Fix Some DateName Issues for dates in Aero; --- src/dsd_file.c | 6 +++++- src/dsd_frame_sync.c | 6 +++++- src/dsd_ncurses.c | 10 +++++++--- src/edacs-fme.c | 6 +++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/dsd_file.c b/src/dsd_file.c index 339977f..bf470b8 100644 --- a/src/dsd_file.c +++ b/src/dsd_file.c @@ -34,7 +34,11 @@ char * getTimeF(void) //get pretty hh:mm:ss timestamp } char * getDateF(void) { - char datename[80]; //32-bit needs this to be 80 + #ifdef AERO_BUILD + char datename[80]; + #else + char datename[99]; + #endif char * curr2; struct tm * to; time_t t; diff --git a/src/dsd_frame_sync.c b/src/dsd_frame_sync.c index 9507c5d..7287a03 100644 --- a/src/dsd_frame_sync.c +++ b/src/dsd_frame_sync.c @@ -67,7 +67,11 @@ char * getTime(void) //get pretty hh:mm:ss timestamp } char * getDate(void) { - char datename[32]; + #ifdef AERO_BUILD + char datename[80]; + #else + char datename[99]; + #endif char * curr2; struct tm * to; time_t t; diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index 504abbb..db9572d 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -248,7 +248,11 @@ void beeper (dsd_opts * opts, dsd_state * state, int type) #endif char * getDateN(void) { - char datename[80]; //bug in 32-bit Ubuntu when using date in filename, date is garbage text + #ifdef AERO_BUILD + char datename[80]; + #else + char datename[99]; + #endif char * curr2; struct tm * to; time_t t; @@ -274,9 +278,9 @@ char * getTimeN(void) //get pretty hh:mm:ss timestamp return curr; } - +//this version is broken now in Cygwin with the 80 value, reverted back char * getDateC(time_t t) { - char datename[99]; //Ubuntu 32-bit, use 80; everything else, use 99 + char datename[99]; char * curr2; struct tm * to; diff --git a/src/edacs-fme.c b/src/edacs-fme.c index 533add6..136cdb7 100644 --- a/src/edacs-fme.c +++ b/src/edacs-fme.c @@ -19,7 +19,11 @@ #include "dsd.h" char * getDateE(void) { - char datename[99]; //might honestly just need a much smaller size, and not a larger one + #ifdef AERO_BUILD + char datename[80]; + #else + char datename[99]; + #endif char * curr2; struct tm * to; time_t t;