Update Changelog.md, version 1.3.3

.forgejo/workflows/build_releases.yaml

@@ -67,7 +67,7 @@ jobs:
             -H 'Content-Type: application/json' \
             -d "{
               \"body\": \"$(jq .body < "${THE_ACTION_WORKING_DIRECTORY}/current_release_info.json" | sed -e 's/^"//' -e 's/"$//')
-              $(find "${THE_ACTION_WORKING_DIRECTORY}" -maxdepth 1 -name "*${BUILD_ASSET_NAME}" -execdir sha256sum '{}' ';')\"
+              $(find "${THE_ACTION_WORKING_DIRECTORY}" -maxdepth 1 -name "*${BUILD_ASSET_NAME}" -execdir sha256sum '{}' ';' | sed -e 's|\./break|break|')\"
             }" >&/dev/null
             curl --fail-with-body -X POST \
             "https://git.seodisparate.com/api/v1/repos/stephenseo/break_interval/releases/$(jq .id < "${THE_ACTION_WORKING_DIRECTORY}/release_info.json")/assets" \
@@ -119,7 +119,7 @@ jobs:
             -H 'Content-Type: application/json' \
             -d "{
               \"body\": \"$(jq .body < "${THE_ACTION_WORKING_DIRECTORY}/current_release_info.json" | sed -e 's/^"//' -e 's/"$//')
-              $(find "${THE_ACTION_WORKING_DIRECTORY}" -maxdepth 1 -name "*${BUILD_ASSET_NAME}" -execdir sha256sum '{}' ';')\"
+              $(find "${THE_ACTION_WORKING_DIRECTORY}" -maxdepth 1 -name "*${BUILD_ASSET_NAME}" -execdir sha256sum '{}' ';' | sed -e 's|\./break|break|')\"
             }" >&/dev/null
             curl --fail-with-body -X POST \
             "https://git.seodisparate.com/api/v1/repos/stephenseo/break_interval/releases/$(jq .id < "${THE_ACTION_WORKING_DIRECTORY}/release_info.json")/assets" \

CMakeLists.txt

@@ -8,8 +8,6 @@ add_executable(break_interval ${break_interval_SOURCES})
 
 add_compile_options(
     -Wall -Wextra -Wpedantic -Wno-missing-braces
-    $<$<COMPILE_LANGUAGE:CXX>:-Weffc++>
-    $<$<CONFIG:DEBUG>:-Og>
 )
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -17,3 +15,49 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
 endif()
+
+target_compile_options(break_interval PUBLIC
+    -Wall -Wformat -Wformat=2 -Wconversion -Wimplicit-fallthrough
+    -Werror=format-security
+    -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
+    -D_GLIBCXX_ASSERTIONS
+    -fstrict-flex-arrays=3
+    -fstack-clash-protection -fstack-protector-strong
+    -Wl,-z,nodlopen -Wl,-z,noexecstack
+    -Wl,-z,relro -Wl,-z,now
+    -Wl,--as-needed -Wl,--no-copy-dt-needed-entries
+    -fPIE -pie
+)
+
+target_link_options(break_interval PUBLIC
+    -Wall -Wformat -Wformat=2 -Wconversion -Wimplicit-fallthrough
+    -Werror=format-security
+    -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
+    -D_GLIBCXX_ASSERTIONS
+    -fstrict-flex-arrays=3
+    -fstack-clash-protection -fstack-protector-strong
+    -Wl,-z,nodlopen -Wl,-z,noexecstack
+    -Wl,-z,relro -Wl,-z,now
+    -Wl,--as-needed -Wl,--no-copy-dt-needed-entries
+    -fPIE -pie
+)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    target_compile_options(break_interval PUBLIC
+        -O3
+        -fno-delete-null-pointer-checks -fno-strict-overflow
+        -fno-strict-aliasing -ftrivial-auto-var-init=zero
+    )
+    target_link_options(break_interval PUBLIC
+        -O3
+        -fno-delete-null-pointer-checks -fno-strict-overflow
+        -fno-strict-aliasing -ftrivial-auto-var-init=zero
+    )
+else()
+    target_compile_options(break_interval PUBLIC
+        -Og
+    )
+    target_link_options(break_interval PUBLIC
+        -Og
+    )
+endif()

Changelog.md

@@ -2,6 +2,13 @@
 
 ## Upcoming Changes
 
+## Version 1.3.3
+
+Minor tweak to action/workflow for release assets.  
+Compiler hardening flags, fixes related to flags.  
+Internal change: make flag used by signal "volatile" (doesn't change much for
+users).
+
 ## Version 1.3.2
 
 Updated action/workflow to build for Debian aarch64.

src/main.c

@@ -14,7 +14,7 @@
 
 #define DEFAULT_FILE_PLAYER_PROGRAM "/usr/bin/mpv"
 
-int is_running;
+volatile int is_running;
 
 void interval_notification_handle_signal(int sig) {
   if (sig == SIGINT) {
@@ -104,9 +104,12 @@ int play_jingle_from_file(char *player,
   default:
     if (use_internal_file_specified != 0) {
       close(pipe_filedes[0]);
-      write(pipe_filedes[1],
+      ssize_t ret = write(pipe_filedes[1],
             interval_notification_mp3,
             interval_notification_mp3_len);
+      if (ret != interval_notification_mp3_len) {
+        fprintf(stderr, "WARNING: Did not write all bytes of mp3 to player!\n");
+      }
       close(pipe_filedes[1]);
     }
     break;
@@ -161,11 +164,16 @@ int play_jingle_from_memory(void) {
     exit(0);
     break;
   default:
-    close(pipe_filedes[0]);
+    {
-    write(pipe_filedes[1],
+      close(pipe_filedes[0]);
-          interval_notification_mp3,
+      ssize_t ret = write(pipe_filedes[1],
-          interval_notification_mp3_len);
+            interval_notification_mp3,
-    close(pipe_filedes[1]);
+            interval_notification_mp3_len);
+      if (ret != interval_notification_mp3_len) {
+        fprintf(stderr, "WARNING: Did not write all bytes of mp3 to player!\n");
+      }
+      close(pipe_filedes[1]);
+    }
     break;
   }
 
@@ -185,7 +193,8 @@ int main(int argc, char **argv) {
      return 0;
    }
 
-  unsigned int minutes = 5;
+  unsigned int minutes;
+  int temp_minutes = 5;
   char *file_name = NULL;
   char *player_name = NULL;
   char **player_args = NULL;
@@ -200,28 +209,34 @@ int main(int argc, char **argv) {
       print_help();
       return 4;
     }
-    minutes = atoi(argv[1]);
+    temp_minutes = atoi(argv[1]);
   } else if (argc == 3) {
-    minutes = atoi(argv[1]);
+    temp_minutes = atoi(argv[1]);
     file_name = argv[2];
   } else if (argc == 4) {
-    minutes = atoi(argv[1]);
+    temp_minutes = atoi(argv[1]);
     file_name = argv[2];
     player_name = argv[3];
   } else if (argc > 4) {
-    minutes = atoi(argv[1]);
+    temp_minutes = atoi(argv[1]);
     file_name = argv[2];
     player_name = argv[3];
     player_args = argv + 4;
-    args_count = argc - 4;
+    args_count = (unsigned int)(argc - 4);
   }
 
-  if (minutes == 0) {
+  if (temp_minutes == 0) {
     puts("ERROR: Minutes cannot be set to zero!");
     print_help();
     return 3;
+  } else if (temp_minutes < 0) {
+    puts("ERROR: Minutes cannot be negative!");
+    print_help();
+    return 3;
   }
 
+  minutes = (unsigned int)temp_minutes;
+
   printf("Set to %u minutes...\n", minutes);
   if (player_name) {
     printf("Using player \"%s\"...\n", player_name);