Changeset 6177

Timestamp:

05/01/08 01:43:10 (5 months ago)

Author:

flynd

Message:

Create history dir if missing before writing history file in it. Combined the Save and Append functions as they were almost identical.

Location:

trunk/licq

Files:

• include/licq_history.h (modified) (1 diff)
• src/history.cpp (modified) (4 diffs)

trunk/licq/include/licq_history.h

@@ -16 +16 @@
   void SetFile(const char *, unsigned long);
   void SetFile(const char *, const char *, unsigned long);
-  void Append(const char *);
+  void Append(const char* buf) { Write(buf, true); }
   bool Load(HistoryList &);
   static void Clear(HistoryList &);
-  void Save(const char *);
+  void Save(const char* buf) { Write(buf, false); }
   const char *Description()  { return m_szDescription; }
   const char *FileName()     { return m_szFileName; }
+
+  /**
+   * Write to the history file, creating it if necessary
+   *
+   * @param buf String with data to write
+   * @param append True to append data or false to overwrite file
+   */
+  void Write(const char* buf, bool append);
+
 protected:
   char *m_szFileName;

trunk/licq/src/history.cpp

@@ -11 +11 @@
 #endif
 
+#include <cstdio>
 #include <string.h>
 #include <unistd.h>
@@ -397 +398 @@
 }
 
-//---Save----------------------------------------------------------------------
-/*! \brief Writes history to disk
- *
- * Writes history to disk. If file does not exists it is created.
- */
-void CUserHistory::Save(const char *buf)
+void CUserHistory::Write(const char* buf, bool append)
 {
   if (m_szFileName == NULL || buf == NULL) return;
-  int fd = open(m_szFileName, O_WRONLY | O_CREAT | O_TRUNC, 00600);
+
+  // Make sure history dir exists before trying to write a file in it
+  char historydir[MAX_FILENAME_LEN];
+  snprintf(historydir, sizeof(historydir) - 1, "%s/%s", BASE_DIR, HISTORY_DIR);
+  if (mkdir(historydir, 0700) == -1 && errno != EEXIST)
+  {
+    fprintf(stderr, "Couldn't mkdir %s: %s\n", historydir, strerror(errno));
+    return;
+  }
+
+  int fd = open(m_szFileName, O_WRONLY | O_CREAT | (append ? O_APPEND : O_TRUNC), 00600);
   if (fd == -1)
   {
@@ -413 +419 @@
   }
   write(fd, buf, strlen(buf));
+  if (append)
+    write(fd, "\n", 1);
   close(fd);
 }
@@ -429 +437 @@
   hist.erase(hist.begin(), hist.end());
 }
-
-
-//---Append--------------------------------------------------------------------
-/*! \brief Appends a message to the history
- *
- * Appends message _sz to the history. If the history file does not exist it 
- * will be created.
- */
-void CUserHistory::Append(const char *_sz)
-{
-  if (m_szFileName == NULL || _sz == NULL) return;
-  int fd = open(m_szFileName, O_WRONLY | O_CREAT | O_APPEND, 00600);
-  if (fd == -1)
-  {
-    gLog.Error("%sUnable to open history file (%s):\n%s%s.\n", L_ERRORxSTR,
-               m_szFileName, L_BLANKxSTR, strerror(errno));
-    return;
-  }
-  write(fd, _sz, strlen(_sz));
-  write(fd, "\n", 1);
-  close(fd);
-}
-
-