Merge pull request #150 from youpong/fix-getuser

Get user name by getpwuid instead of environment variable USER

Author: TanmayPatil105

.github/workflows/coverage.yml

@@ -1,4 +1,4 @@
-name: Coverage Testing
+name: Coverage Testing on public beta of Ubuntu 24.04
 
 on:
   push:
@@ -12,9 +12,9 @@ on:
 
 jobs:
   coverage-test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: configure
       run: ./configure --enable-code-coverage
     - name: build

.github/workflows/unit-test.yml

@@ -12,16 +12,16 @@ on:
 
 jobs:
   unit-test:
+    continue-on-error: true
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        os: [ macos-latest, ubuntu-latest, ubuntu-24.04 ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install GNU Getopt on macOS
       if: ${{ matrix.os == 'macos-latest' }}
-      run: |
-        brew install gnu-getopt
+      run: brew install gnu-getopt
     - name: configure
       run: ./configure
     - name: build

README.md

@@ -33,29 +33,31 @@
 
 ## Prerequisites
 
+The following versions or newer are required.
+
 for building
 
-* GNU getopt - 2.37.2 or later
-* GNU Make - 4.3 or later
-* GCC - 11.3.0 or later
+* GNU getopt - 2.37.2
+* GNU Make - 4.3
+* GCC - 13.2.0 or Clang - 15.0.0
 
 for macOS, You can install gnu-getopt by runnning the following command.
-```
+```bash
 $ brew install gnu-getopt
 ```
 
 for generating API documents
 
-* Doxygen - 1.9.1 or later
-* Graphviz -2.43.0 or later
+* Doxygen - 1.9.1
+* Graphviz -2.43.0
 
 for contributing
 
-* ClangFormat - 14.0.0 or later
+* ClangFormat - 14.0.0
 
 for generating gif
 
-* vhs - 0.2.0 or later
+* vhs - 0.2.0
 
 ## Documentation
 

src/Makefile.in

@@ -3,7 +3,7 @@ SRCS = fetch.cpp main.cpp util.cpp
 OBJS = $(SRCS:.cpp=.o)
 
 CXX = @CXX@
-CXXFLAGS = -std=c++2a -Wall -Wextra --pedantic-errors @CXXFLAGS@
+CXXFLAGS = -std=c++17 -Wall -Wextra --pedantic-errors @CXXFLAGS@
 LIBS = @LIBS@
 LDFLAGS = -pthread
 

src/fetch.cpp

@@ -8,12 +8,23 @@ std::vector<std::runtime_error> Command::exceptions;
 std::mutex Command::mtx;
 string Context::PACKAGE_DELIM = "; "s;
 
+#include <pwd.h>
+#include <string.h>
+#include <unistd.h>
 /**
  * @returns gets the username
+ * @throws runtime_error failed to get username
  */
 string getuser()
 {
-    return getenv("USER");
+    auto *p = getpwuid(getuid());
+    if (p == NULL)
+    {
+        throw runtime_error(
+            "Could not get struct passwd: "s + strerror(errno));
+    }
+
+    return p->pw_name;
 }
 
 /**
@@ -634,3 +645,13 @@ void print(string color_name, string distro_name)
 
     return;
 }
+
+void test_getuser()
+{
+    expect(string(getenv("USER")), getuser(), "getuser"s);
+}
+
+void test_fetch()
+{
+    test_getuser();
+}

src/fetch.h

@@ -7,6 +7,7 @@
 #include "config.h"
 #include <algorithm>
 #include <cctype>
+#include <cerrno>
 #include <filesystem>
 #include <fstream>
 #include <functional>
@@ -66,6 +67,8 @@ void printBattery(string path);
 
 void print(string color, string distro_name);
 
+void test_fetch();
+
 // util.cpp
 
 string getColor(string);

src/main.cpp

@@ -4,6 +4,7 @@
 #include "fetch.h"
 
 void DisplayInfo(bool show_battery);
+void test_suite();
 
 /**
  * @returns
@@ -26,7 +27,7 @@ int main(int argc, char *argv[])
         // no-op
         break;
     case Mode::EXEC_TEST:
-        test_util();
+        test_suite();
         cout << Crayon{}.green().text("All unit tests passed."s) << endl;
         return 0;
     case Mode::SHOW_VERSION:
@@ -100,3 +101,9 @@ void DisplayInfo(bool show_battery)
 
     cout << endl;
 }
+
+void test_suite()
+{
+    test_fetch();
+    test_util();
+}