Bug Fixes and Performance Improvements

Author: nixrajput

src/Bus.cpp

@@ -13,14 +13,14 @@ using namespace std;
 // Initialie variables in constructor
 Bus::Bus()
 {
-    strcpy(busNo, "");
+    strlcpy(busNo, "");
     maxSeats = 32;
     bookedSeats = 0;
     busFare = 0.0;
-    strcpy(source, "");
-    strcpy(destination, "");
-    strcpy(sourceTime, "");
-    strcpy(destinationTime, "");
+    strlcpy(source, "");
+    strlcpy(destination, "");
+    strlcpy(sourceTime, "");
+    strlcpy(destinationTime, "");
 }
 
 // Display bus details

src/Bus.h

@@ -3,6 +3,8 @@
 
 #include <iostream>
 
+#include "utils.h"
+
 using namespace std;
 
 // BUS CLASS
@@ -82,25 +84,25 @@ class Bus
     void setSource(char *s)
     {
         if (s && s[0])
-            strcpy(source, s);
+            strlcpy(source, s);
     }
 
     void setDestination(char *d)
     {
         if (d && d[0])
-            strcpy(destination, d);
+            strlcpy(destination, d);
     }
 
     void setSourceTime(char *s)
     {
         if (s && s[0])
-            strcpy(sourceTime, s);
+            strlcpy(sourceTime, s);
     }
 
     void setDestinationTime(char *d)
     {
         if (d && d[0])
-            strcpy(destinationTime, d);
+            strlcpy(destinationTime, d);
     }
 
     void setBusFare(double f)

src/Reservation.cpp

@@ -16,9 +16,9 @@ Reservation::Reservation() {}
 // Generate a ticket
 void Reservation::_generateTicket(char *n, Bus b)
 {
-    strcpy(name, n);
-    strcpy(pnrNo, generatePNR(99999).c_str());
-    strcpy(date, getCurrentDate().c_str());
+    strlcpy(name, n);
+    strlcpy(pnrNo, generatePNR(99999).c_str());
+    strlcpy(date, getCurrentDate().c_str());
     bus = b;
 }
 

src/Reservation.h

@@ -4,6 +4,7 @@
 #include <iostream>
 
 #include "Bus.h"
+#include "utils.h"
 
 // RESERVATION CLASS
 class Reservation
@@ -49,7 +50,7 @@ class Reservation
     void setName(char *n)
     {
         if (n && n[0])
-            strcpy(name, n);
+            strlcpy(name, n);
     }
 };
 

src/utils.h

@@ -3,7 +3,10 @@
 
 #include <cstdlib>
 #include <string>
+#include <cstring>
+#include <limits>
 #include <ctime>
+#include <stddef.h>
 
 using namespace std;
 
@@ -31,8 +34,24 @@ string generatePNR(int n)
 string getCurrentDate()
 {
     time_t t = time(NULL);
-    tm *tPtr = localtime(&t);
+    struct tm tStruct;
+    localtime_s(&tStruct, &t);
 
-    return to_string(tPtr->tm_mday) + "-" + to_string((tPtr->tm_mon) + 1) + "-" + to_string((tPtr->tm_year) + 1900);
+    return std::to_string(tStruct.tm_mday) + "-" + std::to_string(tStruct.tm_mon + 1) + "-" + std::to_string(tStruct.tm_year + 1900);
 }
+
+size_t strlcpy(char *dst, const char *src, size_t dstsize = std::numeric_limits<size_t>::max())
+{
+    size_t srclen = std::strlen(src);
+    size_t copylen = (srclen >= dstsize) ? dstsize - 1 : srclen;
+
+    if (dstsize != 0)
+    {
+        std::memcpy(dst, src, copylen);
+        dst[copylen] = '\0'; // Null-terminate the destination buffer
+    }
+
+    return srclen; // Return the total length of the string it tried to create
+}
+
 #endif // UTILS_H