Fix readme

.gitignore

@@ -4,4 +4,4 @@ rexbacklight
 rexledctl
 *.swp
 build
-include/config.h
+include/version.h

CMakeLists.txt

@@ -1,17 +1,56 @@
 include(CMakeDependentOption)
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.1)
 project(rexbacklight)
-set(rexbacklight_VERSION_MAJOR 1)
-set(rexbacklight_VERSION_MINOR 1)
+
+set(SCRIPT_DIR ${CMAKE_SOURCE_DIR}/scripts)
+
+#set project include directory
 set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include)
-configure_file(
-	"${INCLUDE_PATH}/config.h.in"
-	"${INCLUDE_PATH}/config.h"
-)
 include_directories("${INCLUDE_PATH}")
 
+set(GIT_VERSION_FILE ${CMAKE_SOURCE_DIR}/include/version.h)
+set(GIT_VERSION_TMP_FILE ${CMAKE_SOURCE_DIR}/include/verison.h.tmp)
+
+#require python on windows
+#i know this program can't be built on windows, but i wanted to figure out how to do this
+if(WIN32)
+	find_package(PythonInterp 3 REQUIRED)
+else()
+	find_package(PythonInterp 3 QUIET)
+endif()
+
+if(PYTHONINTERP_FOUND)
+	add_custom_command(
+		OUTPUT ${GIT_VERSION_TMP_FILE}
+		COMMAND ${CMAKE_COMMAND} -E echo "//File generated by CMake. Do not edit!" > ${GIT_VERSION_TMP_FILE}
+		COMMAND ${PYTHON_EXECUTABLE} ${SCRIPT_DIR}/git_branch_name.py >> ${GIT_VERSION_TMP_FILE}
+		COMMAND ${PYTHON_EXECUTABLE} ${SCRIPT_DIR}/git_commit_hash.py >> ${GIT_VERSION_TMP_FILE}
+		COMMAND ${PYTHON_EXECUTABLE} ${SCRIPT_DIR}/git_tag_name.py >> ${GIT_VERSION_TMP_FILE}
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GIT_VERSION_TMP_FILE} ${GIT_VERSION_FILE}
+		COMMAND ${CMAKE_COMMAND} -E remove ${GIT_VERSION_TMP_FILE}
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		COMMENT "Regenerating version.h"
+		VERBATIM
+	)
+elseif(UNIX)
+	add_custom_command(
+		OUTPUT ${GIT_VERSION_TMP_FILE}
+		COMMAND ${CMAKE_COMMAND} -E echo "//File generated by CMake. Do not edit!" > ${GIT_VERSION_TMP_FILE}
+		COMMAND ${SCRIPT_DIR}/git_branch_name.sh >> ${GIT_VERSION_TMP_FILE}
+		COMMAND ${SCRIPT_DIR}/git_commit_hash.sh >> ${GIT_VERSION_TMP_FILE}
+		COMMAND ${SCRIPT_DIR}/git_tag_name.sh >> ${GIT_VERSION_TMP_FILE}
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GIT_VERSION_TMP_FILE} ${GIT_VERSION_FILE}
+		COMMAND ${CMAKE_COMMAND} -E remove ${GIT_VERSION_TMP_FILE}
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		COMMENT "Regenerating version.h"
+		VERBATIM
+	)
+endif()
+
+#setup cmake options
 option(BUILD_REXLEDCTL "Build led control program" ON)
 option(BUILD_REXBACKLIGHT "Build backlight control program" ON)
+option(ENABLE_RESTORE_FILE "Enable backlight restoration from generated save file" ON)
 option(XBACKLIGHT_COMPAT "Use xbacklight style options (eg -get -inc -dec)" OFF)
 CMAKE_DEPENDENT_OPTION(INSTALL_UDEV_LED_RULE "Install the udev rule to allow users of video group to control led devices" ON
 	"BUILD_REXLEDCTL" OFF)
@@ -21,24 +60,53 @@ set(UDEV_DIR "/etc/udev/rules.d" CACHE STRING "Set the output directory for udev
 mark_as_advanced(UDEV_DIR)
 
 if(XBACKLIGHT_COMPAT)
-	add_definitions(-DXBACKLIGHT_COMPAT_OPTIONS)
+	add_definitions("-DXBACKLIGHT_COMPAT_OPTIONS")
 endif()
 
+#locate rjp library requirements
+if(ENABLE_RESTORE_FILE)
+	find_library(RJP_LIB rjp)
+	find_path(RJP_HEADER_DIR rjp.h)
+	#temporary library (no actual library generated)
+	add_library(common_srcs OBJECT src/cmd.c src/common.c src/restore.c)
+	add_definitions("-DENABLE_RESTORE_FILE")
+else()
+	add_library(common_srcs OBJECT src/cmd.c src/common.c)
+endif()
+target_sources(common_srcs PUBLIC ${GIT_VERSION_TMP_FILE})
+
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DREXBACKLIGHT_DEBUG")
+
+#build led control program
 if(BUILD_REXLEDCTL)
-	add_executable (rexledctl src/rexbacklight.c src/cmd.c src/common.c)
-	target_compile_definitions(rexledctl PRIVATE REXLEDCTL)
+	add_executable (rexledctl src/rexbacklight.c)
+	add_dependencies(rexledctl common_srcs)                 #force common_srcs to be built first
+	target_compile_definitions(rexledctl PRIVATE REXLEDCTL) #define REXLEDCTL in C files
+	if(ENABLE_RESTORE_FILE)
+		target_link_libraries(rexledctl PRIVATE "${RJP_LIB}")   #link with rjp
+		target_include_directories(rexledctl PUBLIC "${RJP_HEADER_DIR}") #include rjp.h directory
+	endif()
+	target_link_libraries(rexledctl PRIVATE $<TARGET_OBJECTS:common_srcs>) #link with the common_srcs "library"
 	install(TARGETS rexledctl RUNTIME DESTINATION bin)
 	if(INSTALL_UDEV_LED_RULE)
 		install(FILES ${CMAKE_SOURCE_DIR}/rules/91-leds.rules DESTINATION ${UDEV_DIR})
 	endif()
 endif()
+#build backlight control program
 if(BUILD_REXBACKLIGHT)
-	add_executable (rexbacklight src/rexbacklight.c src/cmd.c src/common.c)
+	add_executable (rexbacklight src/rexbacklight.c)
+	add_dependencies(rexledctl common_srcs)
 	target_compile_definitions(rexbacklight PRIVATE REXBACKLIGHT)
+	if(ENABLE_RESTORE_FILE)
+		target_link_libraries(rexbacklight PRIVATE "${RJP_LIB}")
+		target_include_directories(rexbacklight PUBLIC "${RJP_HEADER_DIR}")
+	endif()
+	target_link_libraries(rexbacklight PRIVATE $<TARGET_OBJECTS:common_srcs>)
 	install(TARGETS rexbacklight RUNTIME DESTINATION bin)
 	if(INSTALL_UDEV_BACKLIGHT_RULE)
 		install(FILES ${CMAKE_SOURCE_DIR}/rules/91-backlight.rules DESTINATION ${UDEV_DIR})
 	endif()
 endif()
 
+#uninstall target
 add_custom_target(uninstall cat install_manifest.txt | xargs rm)

README.md

@@ -1,31 +1,33 @@
 # README
 
 ## About
-rexbacklight is a program designed to operate similarly to xbacklight, though it's not a drop in replacement (possibly adding drop in replacement configure option at some point). Unlike xbacklight, this program does not use X11 to control the backlight devices. rexbacklight directly interacts with sysfs to change backlight levels, read their current status, and find their max output level. This has the advantage of allowing rexbacklight to run without the X server running and will work even if X doesn't recognize your backlight device, which was my original inspiration to make this project.
+rexbacklight is a program designed to operate similarly to xbacklight. There is even a configure option to enable xbacklight arguments to make this a drop in replacement. However unlike xbacklight, this program does not use X11 to control the backlight devices. rexbacklight directly interacts with sysfs to change backlight levels, read their current status, and find their max output level. This has the advantage of allowing rexbacklight to run without the X server running and will work even if X doesn't recognize your backlight device, which was my original inspiration to make this project.
 
 I've also since added a program to control LED devices, rexledctl (best name I could think of). This one was inspired by the fact that my laptop's keyboard backlight wasn't controllable by any program I had and the hardware button didn't work either. So now I have my own program which can control it. It was so similar in function to rexbacklight that I decided to just add some compile time `#define`'s and make a few things more modular in the code and have the same source files make 2 different programs.
 
 Either program can be built alone or both together. This is configured using some cmake magic.
 
-Current version is 1.0 as of writing this, so if the version is much newer, remind me to update this readme.
+Current version is 1.3.1 as of writing this, so if the version is much newer, remind me to update this readme.
 
 ```
 Usage: rexbacklight [argument] [options] [argument]
 
 Options:
-  --device|-d
+--device|-d
     select which device to control
-  --fade|-f
+--fade|-f
     change brightness over time interval
-  --steps|-s
+--steps|-s
     number of steps over which to fade
-  --get|-g
+--get|-g
     print current brightness level to stdout
-  --list|-l
+--list|-l
     print device names to stdout and exit
-  --help|-h
+--restore|-R
+    reassign previously saved device values
+--help|-h
     print this help message and exit
-  --version
+--version
     print program version and exit
 
 Arguments:
@@ -43,6 +45,9 @@ under certain conditions; see the GNU GPLv3 for details.
 A copy of the GPLv3 is available with the source in the file 'LICENSE'
 ```
 
+## Dependencies
+Requires the rjp ([rexy's json parser][rjp]) library for reading restore file, though this can be disabled via cmake configuration.  
+Either python3 or sh compatible shell to run some build scripts.
 
 ## Building
 ##### Run the following commands
@@ -70,3 +75,5 @@ sudo udevadm trigger
 ```
 sudo make uninstall
 ```
+
+[rjp]: https://gitlab.com/rexy712/rjp

include/cmd.h

@@ -16,13 +16,14 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef RECBACKLIGHT_CMD_H
+#ifndef REXBACKLIGHT_CMD_H
 #define REXBACKLIGHT_CMD_H
 
 #define OP_INC     1
 #define OP_DEC     2
 #define OP_SET     4
 #define OP_LIST    8
+#define OP_RESTORE 16
 #define OP_GET     128
 #define OP_NONE    0
 #define OP_VERSION 254
@@ -31,6 +32,9 @@
 struct cmd_arg{
 	const char* lopt;
 	const char* sopt;
+#ifdef XBACKLIGHT_COMPAT_OPTIONS
+	const char* xopt;
+#endif
 	const char* desc;
 };
 
@@ -52,7 +56,10 @@ struct arg_values{
 
 	int fade_steps;
 
-	unsigned char operation;
+	union{
+		int operation;
+		int num_values;
+	};
 };
 
 

include/common.h

@@ -9,18 +9,22 @@
 
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program.	If not, see <http://www.gnu.org/licenses/>.
+	along with this program, If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdlib.h>
-
 #ifndef REXBACKLIGHT_COMMON_H
 #define REXBACKLIGHT_COMMON_H
 
+#ifdef REXBACKLIGHT_DEBUG
+#define DEBUG_PRINT(s, ...) printf(s, __VA_ARGS__)
+#else
+#define DEBUG_PRINT(s, ...)
+#endif
+
 #define RETVAL_INVALID_FILE         1
 #define RETVAL_INVALID_DIR          2
 #define RETVAL_UNRECOGNIZED_OPTION  3
@@ -29,11 +33,27 @@
 #define RETVAL_MEM_ERROR            6
 #define RETVAL_INTERNAL_ERROR       7
 #define RETVAL_SUCCESS              EXIT_SUCCESS
+
+#define IO_ERROR_DIR   "directory"
+#define IO_ERROR_FILE  "file"
+#define IO_ERROR_OPEN  "open"
+#define IO_ERROR_READ  "read"
+#define IO_ERROR_WRITE "write to"
+
 extern int return_value;
 
+struct string_array{
+	char** list;
+	int size;
+};
+void free_string_array(struct string_array* s);
+
+void io_error(const char* error, const char* type, const char* name);
+void io_error_2(const char* error, const char* type, const char* name, const char* name2);
+void io_error_3(const char* error, const char* type, const char* name, const char* name2, const char* name3);
 void mem_error(void);
+
 _Noreturn void version(void);
 _Noreturn void usage(int exit_val);
 
-
 #endif

include/config.h

@@ -9,18 +9,23 @@
 
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.        See the
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,  See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program.        If not, see <http://www.gnu.org/licenses/>.
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define REXBACKLIGHT_VERSION_MAJOR @rexbacklight_VERSION_MAJOR@
-#define REXBACKLIGHT_VERSION_MINOR @rexbacklight_VERSION_MINOR@
+#include "version.h"
+
+#ifdef GIT_TAG_NAME
+	#define REXBACKLIGHT_VERSION GIT_TAG_NAME
+#else
+	#define REXBACKLIGHT_VERSION GIT_BRANCH_NAME "-" GIT_COMMIT_HASH
+#endif
 
 #endif
 

include/globals.h

@@ -0,0 +1,28 @@
+/**
+	rexbacklight
+	Copyright (C) 2018 rexy712
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef GLOBALS_H
+#define GLOBALS_H
+
+const char* device_dir(void);
+const char* executable_name(void);
+const char* restore_file_suffix(void);
+const char* brightness_file(void);
+const char* max_brightness_file(void);
+
+#endif

include/restore.h

@@ -0,0 +1,32 @@
+/**
+	rexbacklight
+	Copyright (C) 2018 rexy712
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef RESTORE_H
+#define RESTORE_H
+
+#include <rjp.h>
+
+#include "common.h"
+#include "cmd.h"
+
+void save_restore_file(struct string_array* devices);
+int restore_to_delta(struct arg_values* curr, RJP_value** root, int* try_restore);
+RJP_value* find_matching_json_device(const char* name, RJP_value* root);
+RJP_value* read_restore_file(const char* file);
+
+#endif

include/rexbacklight.h

@@ -0,0 +1,27 @@
+/**
+	rexbacklight
+	Copyright (C) 2018 rexy712
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef REXBACKLIGHT_H
+#define REXBACKLIGHT_H
+
+#include "cmd.h"
+
+float get_brightness(const char* file);
+int individual_device_op(struct arg_values* curr);
+
+#endif

scripts/git_branch_name.py

@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+import subprocess
+
+output = subprocess.run(['git', 'rev-parse', "--abbrev-ref", "HEAD"], stdout=subprocess.PIPE).stdout.decode('utf-8').rstrip()
+
+if output:
+	print("#define GIT_BRANCH_NAME " + '"' + output + '"')

scripts/git_branch_name.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+output="$(git rev-parse --abbrev-ref HEAD)"
+
+if test -n "$output";then
+	echo "#define GIT_BRANCH_NAME \"$output\" //test"
+fi

scripts/git_commit_hash.py

@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+import subprocess
+
+output = subprocess.run(['git', 'describe', "--always", "--dirty", "--abbrev", "--match=\"NeVeRmAtCh\""], stdout=subprocess.PIPE).stdout.decode('utf-8').rstrip()
+
+if output:
+	print("#define GIT_COMMIT_HASH " + '"' + output + '"')

scripts/git_commit_hash.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+output="$(git describe --always --dirty --abbrev --match="NeVeRmAtCh")"
+
+if test -n output;then
+	echo "#define GIT_COMMIT_HASH \"$output\""
+fi

scripts/git_tag_name.py

@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+import subprocess
+
+output = subprocess.run(['git', 'tag', "--points-at", "HEAD"], stdout=subprocess.PIPE).stdout.decode('utf-8').rstrip()
+
+if output:
+	if output[0] == 'v' or output[0] == 'V':
+		print("#define GIT_TAG_NAME " + '"' + output[1:] + '"')

scripts/git_tag_name.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+output="$(git tag --points-at HEAD)"
+
+if test -n "$output";then
+	if test "${output:0:1}" = "v" || test "${output:0:1}" = "V";then
+		echo "#define GIT_TAG_NAME \"${output:1}\""
+	fi
+fi

src/cmd.c

@@ -16,39 +16,48 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <stdio.h> //fprintf
+#include <string.h> //strcmp
+#include <stdlib.h> //malloc, free, strtol, atof
 
 #include "cmd.h"
 #include "common.h"
+#include "config.h"
 
-#define NO_OPT           NULL
-#define GET_LONG_OPT     "--get"
-#define GET_SHORT_OPT    "-g"
-#define FADE_LONG_OPT    "--fade"
-#define FADE_SHORT_OPT   "-f"
-#define STEPS_LONG_OPT   "--steps"
-#define STEPS_SHORT_OPT  "-s"
-#define DEVICE_LONG_OPT  "--device"
-#define DEVICE_SHORT_OPT "-d"
-#define LIST_LONG_OPT    "--list"
-#define LIST_SHORT_OPT   "-l"
-#define HELP_LONG_OPT    "--help"
-#define HELP_SHORT_OPT   "-h"
-#define HELP_LONG_OPT    "--help"
-#define HELP_SHORT_OPT   "-h"
-#define VERSION_LONG_OPT "--version"
-
-#define DEVICE_XBACK_OPT  "-display"
-#define HELP_XBACK_OPT    "-help"
-#define VERSION_XBACK_OPT "-version"
-#define SET_XBACK_OPT     "-set"
-#define INC_XBACK_OPT     "-inc"
-#define DEC_XBACK_OPT     "-dec"
+#define NO_OPT            NULL
+#define GET_LONG_OPT      "--get"
+#define GET_SHORT_OPT     "-g"
 #define GET_XBACK_OPT     "-get"
+#define FADE_LONG_OPT     "--fade"
+#define FADE_SHORT_OPT    "-f"
 #define FADE_XBACK_OPT    "-time"
+#define STEPS_LONG_OPT    "--steps"
+#define STEPS_SHORT_OPT   "-s"
 #define STEPS_XBACK_OPT   "-steps"
+#define DEVICE_LONG_OPT   "--device"
+#define DEVICE_SHORT_OPT  "-d"
+#define DEVICE_XBACK_OPT  "-display"
+#define LIST_LONG_OPT     "--list"
+#define LIST_SHORT_OPT    "-l"
+#define LIST_XBACK_OPT    NO_OPT
+#define HELP_LONG_OPT     "--help"
+#define HELP_SHORT_OPT    "-h"
+#define HELP_XBACK_OPT    "-help"
+#define VERSION_LONG_OPT  "--version"
+#define VERSION_SHORT_OPT NO_OPT
+#define VERSION_XBACK_OPT "-version"
+#define SET_LONG_OPT      NO_OPT
+#define SET_SHORT_OPT     NO_OPT
+#define SET_XBACK_OPT     "-set"
+#define INC_LONG_OPT      NO_OPT
+#define INC_SHORT_OPT     NO_OPT
+#define INC_XBACK_OPT     "-inc"
+#define DEC_LONG_OPT      NO_OPT
+#define DEC_SHORT_OPT     NO_OPT
+#define DEC_XBACK_OPT     "-dec"
+#define RESTORE_LONG_OPT  "--restore"
+#define RESTORE_SHORT_OPT "-R"
+#define RESTORE_XBACK_OPT NO_OPT
 
 #define DEVICE_DESC  "select which device to control"
 #define FADE_DESC    "change brightness over time interval"
@@ -60,41 +69,56 @@
 #define SET_DESC     "set backlight device to specified value"
 #define INC_DESC     "increase backlight device by specified value"
 #define DEC_DESC     "decrease backlight device by specified value"
+#define RESTORE_DESC "reassign previously saved device values"
+
+int strcmp_handle_null(const char* one, const char* two){
+	if(!one)
+		return 1;
+	if(!two)
+		return -1;
+	return strcmp(one, two);
+}
+
+#define CHECK_SHORT_OPTION(opt, arg) (!strcmp(opt##_SHORT_OPT, arg))
+#define CHECK_LONG_OPTION(opt, arg) (!strcmp(opt##_LONG_OPT, arg))
+#define CHECK_XBACK_OPTION(opt, arg) (!strcmp(opt##_XBACK_OPT, arg))
 
 #ifdef XBACKLIGHT_COMPAT_OPTIONS
-#define CHECK_SHORT_OPTION(opt, arg) assert(0)
-#define CHECK_LONG_OPTION(opt, arg) (!strcmp(opt##_XBACK_OPT, arg))
-#define CHECK_OPTION(opt, arg) (!strcmp(opt##_XBACK_OPT, arg))
 
+#define CHECK_OPTION(opt, arg) (!strcmp_handle_null(opt##_LONG_OPT, arg) || !strcmp_handle_null(opt##_SHORT_OPT, arg) || !strcmp_handle_null(opt##_XBACK_OPT, arg))
 struct cmd_arg rexbacklight_args[] = {
-  {DEVICE_XBACK_OPT,  NO_OPT, DEVICE_DESC},
-	{SET_XBACK_OPT,     NO_OPT, SET_DESC},
-	{INC_XBACK_OPT,     NO_OPT, INC_DESC},
-	{DEC_XBACK_OPT,     NO_OPT, DEC_DESC},
-  {FADE_XBACK_OPT,    NO_OPT, FADE_DESC},
-  {STEPS_XBACK_OPT,   NO_OPT, STEPS_DESC},
-  {GET_XBACK_OPT,     NO_OPT, GET_DESC},
-  {HELP_XBACK_OPT,    NO_OPT, HELP_DESC},
-  {VERSION_XBACK_OPT, NO_OPT, VERSION_DESC}
+	{DEVICE_LONG_OPT,  DEVICE_SHORT_OPT,  DEVICE_XBACK_OPT,  DEVICE_DESC},
+	{NO_OPT,           NO_OPT,            SET_XBACK_OPT,     SET_DESC},
+	{NO_OPT,           NO_OPT,            INC_XBACK_OPT,     INC_DESC},
+	{NO_OPT,           NO_OPT,            DEC_XBACK_OPT,     DEC_DESC},
+	{FADE_LONG_OPT,    FADE_SHORT_OPT,    FADE_XBACK_OPT,    FADE_DESC},
+	{STEPS_LONG_OPT,   STEPS_SHORT_OPT,   STEPS_XBACK_OPT,   STEPS_DESC},
+	{GET_LONG_OPT,     GET_SHORT_OPT,     GET_XBACK_OPT,     GET_DESC},
+	{LIST_LONG_OPT,    LIST_SHORT_OPT,    LIST_XBACK_OPT,    LIST_DESC},
+#ifdef ENABLE_RESTORE_FILE
+	{RESTORE_LONG_OPT, RESTORE_SHORT_OPT, RESTORE_XBACK_OPT, RESTORE_DESC},
+#endif
+	{HELP_LONG_OPT,    HELP_SHORT_OPT,    HELP_XBACK_OPT,    HELP_DESC},
+	{VERSION_LONG_OPT, NO_OPT,            VERSION_XBACK_OPT, VERSION_DESC}
 };
 
 #else //XBACKLIGHT_COMPAT_OPTIONS
-#define CHECK_SHORT_OPTION(opt, arg) (!strcmp(opt##_SHORT_OPT, arg))
-#define CHECK_LONG_OPTION(opt, arg) (!strcmp(opt##_LONG_OPT, arg))
-#define CHECK_OPTION(opt, arg) (!strcmp(opt##_LONG_OPT, arg) || !strcmp(opt##_SHORT_OPT, arg))
 
+#define CHECK_OPTION(opt, arg) (!strcmp_handle_null(opt##_LONG_OPT, arg) || !strcmp_handle_null(opt##_SHORT_OPT, arg))
 struct cmd_arg rexbacklight_args[] = {
-	{DEVICE_LONG_OPT,  DEVICE_SHORT_OPT, DEVICE_DESC},
-	{FADE_LONG_OPT,    FADE_SHORT_OPT,   FADE_DESC},
-	{STEPS_LONG_OPT,   STEPS_SHORT_OPT,  STEPS_DESC},
-	{GET_LONG_OPT,     GET_SHORT_OPT,    GET_DESC},
-	{LIST_LONG_OPT,    LIST_SHORT_OPT,   LIST_DESC},
-	{HELP_LONG_OPT,    HELP_SHORT_OPT,   HELP_DESC},
-	{VERSION_LONG_OPT, NO_OPT,           VERSION_DESC}
+	{DEVICE_LONG_OPT,  DEVICE_SHORT_OPT,  DEVICE_DESC},
+	{FADE_LONG_OPT,    FADE_SHORT_OPT,    FADE_DESC},
+	{STEPS_LONG_OPT,   STEPS_SHORT_OPT,   STEPS_DESC},
+	{GET_LONG_OPT,     GET_SHORT_OPT,     GET_DESC},
+	{LIST_LONG_OPT,    LIST_SHORT_OPT,    LIST_DESC},
+#ifdef ENABLE_RESTORE_FILE
+	{RESTORE_LONG_OPT, RESTORE_SHORT_OPT, RESTORE_DESC},
+#endif
+	{HELP_LONG_OPT,    HELP_SHORT_OPT,    HELP_DESC},
+	{VERSION_LONG_OPT, NO_OPT,            VERSION_DESC}
 };
 #endif //XBACKLIGHT_COMPAT_OPTIONS
 
-
 int rexbacklight_args_length = sizeof(rexbacklight_args) / sizeof(rexbacklight_args[0]);
 
 //Clean up a cmd_arg struct
@@ -130,6 +154,7 @@ struct arg_values init_arg_values(void){
 struct arg_values process_cmd_args(int argc, char** argv){
 	struct arg_values ret = init_arg_values();
 	struct arg_values* curr = &ret;
+	int nvals = 0;
 	int i;
 
 	//Skip argv[0]
@@ -164,6 +189,7 @@ struct arg_values process_cmd_args(int argc, char** argv){
 			*(curr->next) = init_arg_values();
 			curr = curr->next;
 			curr->device = argv[++i];
+			++nvals;
 			continue;
 		}
 
@@ -171,18 +197,22 @@ struct arg_values process_cmd_args(int argc, char** argv){
 			free_cmd_args(&ret);
 			return (struct arg_values){.operation = OP_USAGE};
 		}
-		else if(CHECK_LONG_OPTION(VERSION, argv[i])){
+		else if(CHECK_OPTION(VERSION, argv[i])){
 			free_cmd_args(&ret);
 			return (struct arg_values){.operation = OP_VERSION};
 		}
 
-#ifndef XBACKLIGHT_COMPAT_OPTIONS
 		else if(CHECK_OPTION(LIST, argv[i])){
 			free_cmd_args(&ret);
 			ret.operation = OP_LIST;
 			ret.next = NULL;
 			return ret;
 		}
+#ifdef ENABLE_RESTORE_FILE
+		else if(CHECK_OPTION(RESTORE, argv[i])){
+			ret.operation = OP_RESTORE;
+		}
+#endif
 		else if(!strcmp(argv[i], "max")){
 			curr->operation = OP_SET;
 			curr->delta = 100;
@@ -195,7 +225,7 @@ struct arg_values process_cmd_args(int argc, char** argv){
 			curr->operation = OP_SET;
 			curr->delta = 0;
 		}
-#else //XBACKLIGHT_COMPAT_OPTIONS
+#ifdef XBACKLIGHT_COMPAT_OPTIONS
 	else if(CHECK_OPTION(SET, argv[i])){
 		CHECK_NEXT_ARG();
 		curr->operation = OP_SET;
@@ -276,6 +306,8 @@ struct arg_values process_cmd_args(int argc, char** argv){
 			}
 		}
 	}
+	if(ret.next)
+		ret.num_values = nvals;
 	return ret;
 }
 #undef CHECK_OPTION
@@ -314,3 +346,4 @@ int process_op(struct arg_values* arg, float min, float current, float max){
 	return current;
 }
 
+

src/common.c

@@ -19,37 +19,67 @@
 #include "config.h"
 #include "common.h"
 #include "cmd.h"
+#include "globals.h"
 
-#include <stdio.h>
+#include <stdio.h> //printf
+#include <stdlib.h> //exit
 
 int return_value = RETVAL_SUCCESS;
 
+void io_error(const char* error, const char* type, const char* name){
+	fprintf(stderr, "Unable to %s %s '%s'!\n", error, type, name);
+}
+void io_error_2(const char* error, const char* type, const char* name, const char* name2){
+	fprintf(stderr, "Unable to %s %s '%s%s'!\n", error, type, name, name2);
+}
+void io_error_3(const char* error, const char* type, const char* name, const char* name2, const char* name3){
+	fprintf(stderr, "Unable to %s %s '%s%s%s'!\n", error, type, name, name2, name3);
+}
+
+//Clean up a string array
+void free_string_array(struct string_array* s){
+	int i;
+	for(i = 0;i < s->size;++i)
+		free(s->list[i]);
+	free(s->list);
+}
+
 void mem_error(void){
 	fprintf(stderr, "Failed to allocate memory! Unable to continue!\n");
 }
 
-//name of the program being run so that we print the correct name in the usage
-extern const char* executable_name;
-
 _Noreturn void version(void){
-	printf("%s version %d.%d\n", executable_name, REXBACKLIGHT_VERSION_MAJOR, REXBACKLIGHT_VERSION_MINOR);
+	printf("%s version %s\n", executable_name(), REXBACKLIGHT_VERSION);
 	exit(return_value);
 }
 
 _Noreturn void usage(int exit_val){
 	int i;
-	printf("%s version %d.%d\n\n", executable_name, REXBACKLIGHT_VERSION_MAJOR, REXBACKLIGHT_VERSION_MINOR);
-	printf("Usage: %s [argument] [options] [argument]\n\n", executable_name);
+	printf("%s version %s\n\n", executable_name(), REXBACKLIGHT_VERSION);
+	printf("Usage: %s [argument] [options] [argument]\n\n", executable_name());
 
 	printf("Options:\n");
 	for(i = 0;i < rexbacklight_args_length;++i){
-		if(!rexbacklight_args[i].lopt){
-			printf("  %s\n", rexbacklight_args[i].sopt);
-		}else if(!rexbacklight_args[i].sopt){
-			printf("  %s\n", rexbacklight_args[i].lopt);
-		}else{
-			printf("  %s|%s\n", rexbacklight_args[i].lopt, rexbacklight_args[i].sopt);
+		int printed = 0;
+		if(rexbacklight_args[i].lopt){
+			printf("%s", rexbacklight_args[i].lopt);
+			printed = 1;
 		}
+		if(rexbacklight_args[i].sopt){
+			if(printed)
+				printf("|");
+			else
+				printed = 1;
+			printf("%s", rexbacklight_args[i].sopt);
+		}
+#ifdef XBACKLIGHT_COMPAT_OPTIONS
+		if(rexbacklight_args[i].xopt){
+			if(printed)
+				printf("|");
+			printf("%s", rexbacklight_args[i].xopt);
+		}
+#endif //XBACKLIGHT_COMPAT_OPTIONS
+		printf("\n");
 		printf("    %s\n", rexbacklight_args[i].desc);
 	}
 	printf("\n");
@@ -57,13 +87,11 @@ _Noreturn void usage(int exit_val){
 	printf("  =<percentage>\n");
 	printf("  -<percentage>\n");
 	printf("  +<percentage>\n");
-#ifndef XBACKLIGHT_COMPAT_OPTIONS
 	printf("  off\n");
 	printf("  max\n");
 	printf("  min\n");
-#endif //XBACKLIGHT_COMPAT_OPTIONS
 
-	printf("\n%s Copyright (C) 2018 rexy712\n", executable_name);
+	printf("\n%s Copyright (C) 2018 rexy712\n", executable_name());
 	printf("This program comes with ABSOLUTELY NO WARRANTY.\n");
 	printf("This is free software, and you are welcome to redistribute it\n");
 	printf("under certain conditions; see the GNU GPLv3 for details.\n");

src/restore.c

@@ -0,0 +1,159 @@
+/**
+	rexbacklight
+	Copyright (C) 2018 rexy712
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdio.h> //printf
+#include <string.h> //strcmp, strlen
+#include <rjp.h>
+#include <sys/types.h> //getpwnam
+#include <pwd.h> //getpwnam
+#include <unistd.h> //chdir
+#include <stdlib.h> //malloc, free
+
+#include "restore.h"
+#include "common.h"
+#include "cmd.h"
+#include "globals.h"
+#include "rexbacklight.h"
+
+static char* get_home_folder(void){
+	char* user = getenv("SUDO_USER");
+	char* home = getenv("HOME");
+	if(!home || user){
+		if(!user){
+			return NULL;
+		}
+		struct passwd* pw_entry = getpwnam(user);
+		if(!pw_entry){
+			return NULL;
+		}
+		home = pw_entry->pw_dir;
+	}
+	return home;
+}
+static char* restore_file(void){
+	char* home_folder = get_home_folder();
+	if(!home_folder)
+		return NULL;
+
+	//"/.config/rexbacklight.json"
+	size_t home_folder_len = strlen(home_folder);
+	size_t conf_len = strlen(restore_file_suffix());
+	char* rest_file = malloc(home_folder_len + conf_len + 1);
+	strncpy(rest_file, home_folder, home_folder_len);
+	strncpy(rest_file+home_folder_len, restore_file_suffix(), conf_len);
+	rest_file[home_folder_len+conf_len] = 0;
+	return rest_file;
+}
+
+RJP_value* read_restore_file(const char* file){
+	size_t filesize;
+	char* file_contents;
+	int i;
+	FILE* fp = fopen(file, "r");
+	if(!fp){
+		fprintf(stderr, "Could not restore! No restore file found!\n");
+		return NULL;
+	}
+
+	fseek(fp, 0, SEEK_END);
+	filesize = ftell(fp);
+	fseek(fp, 0, SEEK_SET);
+
+	file_contents = malloc(filesize+1);
+	i = fread(file_contents, filesize, 1, fp);
+	fclose(fp);
+	file_contents[filesize] = 0;
+	RJP_value* root = rjp_parse(file_contents);
+	free(file_contents);
+	return root;
+}
+
+RJP_value* find_matching_json_device(const char* name, RJP_value* root){
+	for(RJP_value* curr = rjp_get_member(root);curr;curr = rjp_next_member(curr)){
+		if(!strcmp(rjp_member_name(curr), name)){
+			return curr;
+		}
+	}
+	return NULL;
+}
+
+//convert a restoration operation to a set operation
+int restore_to_delta(struct arg_values* curr, RJP_value** root, int* try_restore){
+	if(!*root && *try_restore){
+		char* tmp = restore_file();
+		*root = read_restore_file(tmp);
+		free(tmp);
+		if(!*root){
+			*try_restore = 0;
+			return 0;
+		}
+	}
+	RJP_value* match = find_matching_json_device(curr->device, *root);
+	if(!match){
+		fprintf(stderr, "No matching device '%s' in restore file!\n", curr->device);
+		return 0;
+	}
+	curr->operation = OP_SET;
+	curr->delta = rjp_value_dfloat(match);
+	return 1;
+}
+
+void save_restore_file(struct string_array* devices){
+ 	RJP_value* root = rjp_init_json();
+	for(size_t i = 0;i < devices->size;++i){
+		if(chdir(devices->list[i])){
+			io_error_2(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir(), devices->list[i]);
+			return_value = RETVAL_INVALID_DIR;
+			continue;
+		}
+		size_t esc_name_len = rjp_escape_strlen(devices->list[i]);
+		char* esc_str = rjp_alloc(esc_name_len + 1);
+		rjp_escape_strcpy(esc_str, devices->list[i]);
+
+		float curr = get_brightness(brightness_file());
+		float max = get_brightness(max_brightness_file());
+		if(return_value == RETVAL_INVALID_FILE && (!curr || !max)){
+			rjp_add_member(root, 0, esc_str, 0, rjp_null());
+		}else{
+			rjp_add_member(root, 0, esc_str, 0, rjp_dfloat(curr/max*100));
+		}
+
+		if(chdir(device_dir())){
+			io_error(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir());
+			return_value = RETVAL_INVALID_DIR;
+			rjp_free_value(root);
+			free(esc_str);
+			return;
+		}
+	}
+	char* tmp = rjp_to_json(root);
+	char* rfil = restore_file();
+	FILE* restf = fopen(rfil, "w");
+	if(!restf){
+		io_error(IO_ERROR_OPEN, IO_ERROR_FILE, rfil);
+	}else{
+		fprintf(restf, "//File generated by %s\n%s\n", executable_name(), tmp);
+		fclose(restf);
+	}
+	free(rfil);
+	rjp_free(tmp);
+	rjp_free_value(root);
+}
+
+
+

src/rexbacklight.c

@@ -16,65 +16,44 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-//Needed for usleep to work
-#define _DEFAULT_SOURCE
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <sys/time.h>
-#include <time.h>
+#include <stdio.h> //fprintf
+#include <stdlib.h> //malloc, free
+#include <string.h> //strlen, strcpy
+#include <unistd.h> //chdir
+#include <sys/types.h> //opendir
+#include <dirent.h> //opendir
+#include <sys/time.h> //gettimeofday
+#include <time.h> //nanosleep
 
 #include "common.h"
 #include "cmd.h"
+#include "globals.h"
+#include "config.h"
+
+#ifdef ENABLE_RESTORE_FILE
+#include <rjp.h>
+#include "restore.h"
+#endif
 
-//name of the program being run so that we print the correct name in the usage
 
 #ifdef REXBACKLIGHT
 //This is where backlight devices can be found in sysfs
-static const char* device_dir = "/sys/class/backlight/";
-const char* executable_name = "rexbacklight";
+const char* device_dir(void){return "/sys/class/backlight/";}
+//name of the program being run so that we print the correct name in the usage
+const char* executable_name(void){return "rexbacklight";}
+//location of the restore file in the home directory
+const char* restore_file_suffix(void){return "/.config/rexbacklight.json";}
 #elif defined(REXLEDCTL)
 //This is where led devices can be found in sysfs
-static const char* device_dir = "/sys/class/leds";
-const char* executable_name = "rexledctl";
+const char* device_dir(void){return "/sys/class/leds/";}
+const char* executable_name(void){return "rexledctl";}
+const char* restore_file_suffix(void){return "/.config/rexledctl.json";}
 #else
 #error "UNDEFINED PROGRAM NAME!"
 #endif
-static const char* brightness_file = "brightness";
-static const char* max_brightness_file = "max_brightness";
+const char* brightness_file(void){return "brightness";}
+const char* max_brightness_file(void){return "max_brightness";}
 
-//Used to store a dynamic array of dynamic strings and number of strings
-struct string_array{
-	char** list;
-	int size;
-};
-
-#define IO_ERROR_DIR   "directory"
-#define IO_ERROR_FILE  "file"
-#define IO_ERROR_OPEN  "open"
-#define IO_ERROR_READ  "read"
-#define IO_ERROR_WRITE "write to"
-
-void io_error(const char* error, const char* type, const char* name){
-	fprintf(stderr, "Unable to %s %s '%s'!\n", error, type, name);
-}
-void io_error_2(const char* error, const char* type, const char* name, const char* name2){
-	fprintf(stderr, "Unable to %s %s '%s/%s'!\n", error, type, name, name2);
-}
-void io_error_3(const char* error, const char* type, const char* name, const char* name2, const char* name3){
-	fprintf(stderr, "Unable to %s %s '%s/%s/%s'!\n", error, type, name, name2, name3);
-}
-
-//Clean up a string array
-void free_string_array(struct string_array* s){
-	int i;
-	for(i = 0;i < s->size;++i)
-		free(s->list[i]);
-	free(s->list);
-}
 
 //Get a list of led/backlight devices in sysfs
 struct string_array get_device_sources(void){
@@ -83,9 +62,9 @@ struct string_array get_device_sources(void){
 	struct string_array arr = {0};
 	int list_size = 8;
 
-	fd = opendir(device_dir);
+	fd = opendir(device_dir());
 	if(!fd){
-		io_error(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir);
+		io_error(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir());
 		return_value = RETVAL_INVALID_DIR;
 		return arr;
 	}
@@ -98,23 +77,24 @@ struct string_array get_device_sources(void){
 		return arr;
 	}
 
-#define MEMORY_ERROR() do{mem_error();return_value = RETVAL_MEM_ERROR;free_string_array(&arr);closedir(fd);}while(0)
-
 	for(arr.size = 0;(dir = readdir(fd));){
 		int slen;
+		//ignore '.' and '..'
 		if(!strncmp(dir->d_name, ".", 1) || !strncmp(dir->d_name, "..", 2)){
 			continue;
 		}
 
 		//Resize list if more than 8 led/backlight devices exist (not likely)
 		if(arr.size >= list_size){
-			int j;
 			char** tmp = malloc(sizeof(const char*) * (list_size += 8));
 			if(!tmp){
-				MEMORY_ERROR();
+				mem_error();
+				return_value = RETVAL_MEM_ERROR;
+				free_string_array(&arr);
+				closedir(fd);
 				return (struct string_array){0};
 			}
-			for(j = 0;j < arr.size;++j){
+			for(int j = 0;j < arr.size;++j){
 				tmp[j] = arr.list[j];
 			}
 			free(arr.list);
@@ -124,16 +104,17 @@ struct string_array get_device_sources(void){
 		slen = strlen(dir->d_name);
 		arr.list[arr.size] = malloc(slen + 1);
 		if(!arr.list[arr.size]){
-			MEMORY_ERROR();
+			mem_error();
+			return_value = RETVAL_MEM_ERROR;
+			free_string_array(&arr);
+			closedir(fd);
 			return (struct string_array){0};
 		}
-		strcpy(arr.list[arr.size], dir->d_name);
+		strncpy(arr.list[arr.size], dir->d_name, slen);
 		arr.list[arr.size][slen] = 0;
 		++arr.size;
 	}
 
-#undef MEMORY_ERROR
-
 	closedir(fd);
 	return arr;
 }
@@ -157,50 +138,61 @@ float get_brightness(const char* file){
 	fclose(bright);
 	return atof(buff);
 }
+//return milliseconds since last boot
+double get_time(void){
+	struct timespec t;
+	clock_gettime(CLOCK_BOOTTIME, &t);
+	return ((t.tv_sec * 1000.0) + (t.tv_nsec * 0.0000001));
+}
+//sleep thread for milliseconds
+void sleep_for(double time){
+	DEBUG_PRINT("sleeping for %lf milliseconds\n", time);
+	struct timespec ts;
+	ts.tv_sec = (long)(time*0.0001);
+	ts.tv_nsec = ((time) - ts.tv_sec*1000) * 1000*1000;
+	nanosleep(&ts, NULL);
+}
 
 //update brightness incrementally over requested millisecond time interval
-void fade_out(const char* device_name, int iv, int fv, int ms_duration, int steps){
+void fade_out(struct arg_values* arg, int iv, int fv){
 	FILE* fd;
-	struct timeval start, end;
-	double tdelta = 0;        //amount of time that has passed in ms
+	double start, end;
+	double tdelta = 0;       //amount of time that has passed in ms
 	float value = iv;        //current value to write to file
-	int step_delta = ms_duration / steps;
-	int step_inc = step_delta;
-	float brdelta = (float)(fv - iv) / steps; //amount brightness needs to change per iteration
+	double step_delta = (double)arg->fade_duration / arg->fade_steps;
+	double step_inc = step_delta;
+	float brdelta = (float)(fv - iv) / arg->fade_steps; //amount brightness needs to change per iteration
 
-	while(ms_duration > tdelta){
+	while(arg->fade_duration > tdelta){
 		//write
-		gettimeofday(&start, NULL);
-		fd = fopen(brightness_file, "w+");
+		start = get_time();
+		fd = fopen(brightness_file(), "w+");
 		if(!fd){
-			io_error_3(IO_ERROR_OPEN, IO_ERROR_FILE, device_dir, device_name, brightness_file);
+			io_error_3(IO_ERROR_OPEN, IO_ERROR_FILE, device_dir(), arg->device, brightness_file());
 			return_value = RETVAL_INVALID_FILE;
 			return;
 		}
 		fprintf(fd, "%d", (int)value);
 		fclose(fd);
-		gettimeofday(&end, NULL);
+		end = get_time();
 
 		//calc time delta
-		tdelta += (((end.tv_sec * 1000.0) + (end.tv_usec / 1000.0)) - ((start.tv_sec * 1000.0) + (start.tv_usec / 1000.0)));
+		tdelta += end - start;
 
 		//calc next value to write
 		value += brdelta;
 
 		//waste excess time until next step
 		if(step_delta > tdelta){
-			struct timespec ts;
-			ts.tv_sec = (long)((step_delta - tdelta)/1000);
-			ts.tv_nsec = ((step_delta - tdelta) - ts.tv_sec*1000) * 1000*1000;
-			nanosleep(&ts, NULL);
+			sleep_for(step_delta - tdelta);
 			tdelta = step_delta;
 		}
 		//calc end of next step
 		step_delta += step_inc;
 	}
-	fd = fopen(brightness_file, "w+");
+	fd = fopen(brightness_file(), "w+");
 	if(!fd){
-		io_error_3(IO_ERROR_OPEN, IO_ERROR_FILE, device_dir, device_name, brightness_file);
+		io_error_3(IO_ERROR_OPEN, IO_ERROR_FILE, device_dir(), arg->device, brightness_file());
 		return_value = RETVAL_INVALID_FILE;
 		return;
 	}
@@ -210,98 +202,128 @@ void fade_out(const char* device_name, int iv, int fv, int ms_duration, int step
 }
 
 //Write value to device files
-void do_assignment(struct arg_values* arg, const char* device){
-	int start = get_brightness(brightness_file);
-	int out = process_op(arg, 0, start, get_brightness(max_brightness_file));
-	fade_out(device, start, out, arg->fade_duration, arg->fade_steps);
-}
-
-//Run get operation
-void do_get(const char* device){
-	float curr, max;
-	curr = get_brightness(brightness_file);
-	max = get_brightness(max_brightness_file);
-	if(return_value == RETVAL_INVALID_FILE && (!curr || !max)){
-		fprintf(stdout, "%s", device);
-	}else{
-		fprintf(stdout, "%-25s %.2f\n", device, get_brightness(brightness_file) / get_brightness(max_brightness_file) * 100);
-	}
-}
-
-//Run list operation
-void do_list(struct string_array* names){
-	int i;
-	for(i = 0;i < names->size;++i)
-		fprintf(stdout, "%s\n", names->list[i]);
-}
-
-//If devices were specified, this function will run
-void individual_device_loop(struct arg_values* a){
-	struct arg_values* curr;
-	for(curr = a->next;curr;curr = curr->next){
-		if(chdir(curr->device)){
-			io_error_2(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir, curr->device);
+int do_assignment(struct arg_values* args){
+	for(;args;args = args->next){
+		if(chdir(args->device)){
+			io_error_2(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir(), args->device);
 			return_value = RETVAL_INVALID_DIR;
 			continue;
 		}
-		switch(curr->operation){
-			case OP_SET:
-			case OP_INC:
-			case OP_DEC:
-				do_assignment(curr, curr->device);
-				break;
-			case OP_GET:
-				do_get(curr->device);
-				break;
+		int start = get_brightness(brightness_file());
+		int out = process_op(args, 0, start, get_brightness(max_brightness_file()));
+		fade_out(args, start, out);
+		if(chdir(device_dir())){
+			io_error(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir());
+			return RETVAL_INVALID_DIR;
 		}
-		if(chdir(device_dir)){
-			io_error(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir);
+	}
+	return return_value;
+}
+
+//Run get operation
+int do_get(struct arg_values* args){
+	for(;args;args = args->next){
+		float curr, max;
+		if(chdir(args->device)){
+			io_error_2(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir(), args->device);
 			return_value = RETVAL_INVALID_DIR;
-			return;
+			continue;
 		}
+		curr = get_brightness(brightness_file());
+		max = get_brightness(max_brightness_file());
+		if(return_value == RETVAL_INVALID_FILE && (!curr || !max)){
+			fprintf(stdout, "%s", args->device);
+		}else{
+			fprintf(stdout, "%-25s %.2f\n", args->device, curr / max * 100);
+		}
+		if(chdir(device_dir())){
+			io_error(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir());
+			return RETVAL_INVALID_DIR;
+		}
+	}
+	return return_value;
+}
+//Run list operation
+void do_list(struct arg_values* args){
+	for(;args;args = args->next){
+		printf("%s\n", args->device);
 	}
 }
 
-//If no devices were specified, this function will run
-void all_device_loop(struct string_array* device_names, struct arg_values* args){
-	int i;
-	switch(args->operation){
-		case OP_SET:
-		case OP_INC:
-		case OP_DEC:
-			for(i = 0;i < device_names->size;++i){
-				if(chdir(device_names->list[i])){
-					io_error_2(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir, device_names->list[i]);
-					return_value = RETVAL_INVALID_DIR;
-					continue;
-				}
-				do_assignment(args, device_names->list[i]);
-				if(chdir(device_dir)){
-					io_error(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir);
-					return_value = RETVAL_INVALID_DIR;
-					return;
-				}
-			}
-			break;
-		case OP_LIST:
-			do_list(device_names);
-			break;
-		case OP_GET:
-			for(i = 0;i < device_names->size;++i){
-				if(chdir(device_names->list[i])){
-					io_error_2(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir, device_names->list[i]);
-					return_value = RETVAL_INVALID_DIR;
-					continue;
-				}
-				do_get(device_names->list[i]);
-				if(chdir(device_dir)){
-					io_error(IO_ERROR_OPEN, IO_ERROR_DIR, device_dir);
-					return_value = RETVAL_INVALID_DIR;
-					return;
-				}
-			}
-			break;
+//move next arg in src list to next arg in dest list
+void extract_next_arg(struct arg_values* dest, struct arg_values* src){
+	dest->next = src->next;
+	src->next = src->next->next;
+	dest->next->next = NULL;
+}
+
+#ifdef ENABLE_RESTORE_FILE
+//convert all restore operations to set operations
+void prep_restore(struct arg_values* a){
+	RJP_value* root = 0;
+	int try_restore = 1;
+	for(struct arg_values* curr = a;curr;curr = curr->next){
+		restore_to_delta(curr, &root, &try_restore);
 	}
+	rjp_free_value(root);
+}
+#else
+#define prep_restore(x)
+#endif
+
+//remove all args in src which have the specified operation and append them to dest
+struct arg_values* extract_operation(int operation, struct arg_values* dest, struct arg_values* src){
+	struct arg_values* curr_dest = dest;
+	dest->next = NULL;
+	for(struct arg_values* curr_src = src;curr_src->next;){
+		if(curr_src->next->operation & operation){
+			extract_next_arg(curr_dest, curr_src);
+			curr_dest = curr_dest->next;
+		}else{
+			curr_src = curr_src->next;
+		}
+	}
+	return curr_dest;
+}
+
+//If devices were specified, this function will run
+void run_device_operations(struct arg_values* a){
+	struct arg_values* curr;
+	struct arg_values current_op_args = {0};
+
+	//list
+	extract_operation(OP_LIST, &current_op_args, a);
+	do_list(current_op_args.next);
+	free_cmd_args(&current_op_args);
+
+	//get
+	extract_operation(OP_GET, &current_op_args, a);
+	return_value = do_get(current_op_args.next);
+	free_cmd_args(&current_op_args);
+
+	//assignment
+	curr = extract_operation(OP_RESTORE, &current_op_args, a);
+	prep_restore(current_op_args.next);
+	extract_operation(OP_SET | OP_INC | OP_DEC, curr, a);
+	return_value = do_assignment(current_op_args.next);
+	free_cmd_args(&current_op_args);
+
+}
+
+//If a global operation is requested, run this to fill arg with all devices, each with the global operation
+void populate_args(struct arg_values* arg, struct string_array* devices){
+	struct arg_values* curr = arg;
+	for(size_t i = 0;i < devices->size;++i){
+		curr->next = malloc(sizeof(struct arg_values));
+		curr->next->device = devices->list[i];
+		curr->next->delta = arg->delta;
+		curr->next->fade_duration = arg->fade_duration;
+		curr->next->fade_steps = arg->fade_steps;
+		curr->next->operation = arg->operation;
+		curr = curr->next;
+	}
+	curr->next = NULL;
+	arg->num_values = devices->size;
 }
 
 
@@ -309,7 +331,7 @@ int main(int argc, char** argv){
 
 	struct arg_values args; //A linked list of devices and the requested settings.
 	struct string_array device_names; //List of all led/backlight devices in sysfs.
-	struct arg_values* curr;
+
 	args = process_cmd_args(argc, argv);
 	if(args.operation == OP_USAGE){
 		usage(return_value);
@@ -319,53 +341,50 @@ int main(int argc, char** argv){
 
 	device_names = get_device_sources();
 
-//Macro for easy memory cleaning
-#define CLEANUP() do{free_string_array(&device_names);free_cmd_args(&args);}while(0)
-
-
-
 	//If there are no led/backlights, we can't do anything
 	if(device_names.size == 0){
 #ifdef REXBACKLIGHT
 		fprintf(stderr, "No backlights devices found!\n");
 #elif defined(REXLEDCTL)
 		fprintf(stderr, "No led devices found!\n");
-#else
-#error "UNDEFINED PROGRAM NAME!"
 #endif
-		CLEANUP();
+		free_string_array(&device_names);
+		free_cmd_args(&args);
 		return RETVAL_INVALID_DEVICE;
 	}
 
 	//Make sure all explicit devices actually exist
-	for(curr = args.next;curr;curr = curr->next){
-		int i;
-		for(i = 0;i < device_names.size;++i){
+	for(struct arg_values* curr = args.next;curr;curr = curr->next){
+		for(int i = 0;i < device_names.size;++i){
 			if(!strcmp(curr->device, device_names.list[i])){
 				goto continue_outer;
 			}
 		}
 		fprintf(stderr, "No such device '%s'\n", curr->device);
-		CLEANUP();
+		free_string_array(&device_names);
+		free_cmd_args(&args);
 		return RETVAL_INVALID_DEVICE;
 		continue_outer:;
 	}
 
 	//Change to the base directory for all sysfs leds/backlights
-	if(chdir(device_dir)){
-		io_error(IO_ERROR_READ, IO_ERROR_DIR, device_dir);
-		CLEANUP();
+	if(chdir(device_dir())){
+		io_error(IO_ERROR_READ, IO_ERROR_DIR, device_dir());
+		free_string_array(&device_names);
+		free_cmd_args(&args);
 		return RETVAL_INVALID_DIR;
 	}
 
 	//Run selected operation
-	if(args.next){
-		individual_device_loop(&args);
-	}else{
-		all_device_loop(&device_names, &args);
+	if(!args.next){
+		populate_args(&args, &device_names);
 	}
+	run_device_operations(&args);
+#ifdef ENABLE_RESTORE_FILE
+		save_restore_file(&device_names);
+#endif
 
-	CLEANUP();
+	free_string_array(&device_names);
+	free_cmd_args(&args);
 	return return_value;
 }
-#undef CLEANUP