Minor code cleanup, wrote a homebrew formula for it

This commit is contained in:
Matthew Connelly 2015-04-30 21:34:26 +01:00
parent 2f57bbddef
commit 68f8c94466
3 changed files with 38 additions and 17 deletions

View File

@ -41,12 +41,9 @@ tags: $(SRC)
@echo [ctags]
@ctags $(SRC)
# root ownership and suid bit is set to enable non-root execution
#install: kbbutil
# @sudo rm -f $(PREFIX)/bin/kbbutil
# @cp -a kbbutil $(PREFIX)/bin/kbbutil
# @sudo chown root:root $(PREFIX)/bin/kbbutil
# @sudo chmod 4755 $(PREFIX)/bin/kbbutil
install: kbbutil
@mv kbbutil $(PREFIX)/bin/kbbutil
depend:
makedepend -Y $(SRC)

View File

@ -10,7 +10,7 @@
// variable defs {{{
io_connect_t io;
uint64_t wtf=0;
uint64_t wtf=0; // I don't know what this is used for
//}}}
int getKBBrightness(void) {//{{{
@ -36,12 +36,35 @@ int main(int argc, char *argv []) {//{{{
kern_return_t kr;
io_service_t is;
is = IOServiceGetMatchingService(kIOMasterPortDefault,IOServiceMatching("AppleLMUController"));
if(!is) {fprintf(stderr,"Failed to into AppleLMUController\n");exit(1);}
if(!is) { fprintf(stderr,"Failed to get AppleLMUController service\n"); exit(1); }
kr = IOServiceOpen(is,mach_task_self(),0,&io);
IOObjectRelease(is);
if(kr!=KERN_SUCCESS) { mach_error("IOKit error: ",kr); exit(kr); }
if(argc==1||(argc==2&&(strcmp(argv[1],"-n")==0||strcmp(argv[1],"--numeric-only")==0))) printf(argc==2? "%i" : "Current keyboard brightness: %i\n",getKBBrightness());
else if(argc==2&&((atoi(argv[1])==0&&strcmp(argv[1],"0")==0)||(atoi(argv[1])>0&&atoi(argv[1])<=4091))) setKBBrightness(atoi(argv[1]));
else {fprintf(stderr,"Invalid argument. kbbutil must be run either with no arguments, with -n or --numeric-only, or with one argument which is a number between 0 and 4091.\n");exit(1);}
//big argparsing block i intend to clean up later, but for now i've just formatted it more readably
if
(argc==1 ||
(argc==2 &&
(strcmp(argv[1],"-n")==0 ||
strcmp(argv[1],"--numeric-only")==0)
)
)
printf(argc==2? "%i\n" : "Current keyboard brightness: %i\n",getKBBrightness());
else if
(argc==2 && (
(atoi(argv[1])==0 && strcmp(argv[1],"0")==0) ||
(atoi(argv[1])> 0 && atoi(argv[1])<=4091)
)
) {
if(!setKBBrightness(atoi(argv[1]))) {
fprintf(stderr,"Error setting brightness to %i.\n",atoi(argv[1]));
exit(1);
}
} else {
fprintf(stderr,"Usage:\n\
- kbbutil : Returns current brightness\n\
- kbbutil [-n|--numeric-only] : Returns only integer brightness\n\
- kbbutil [0-4091] : Set brightness\n");
exit(1);
}
return 0;
}//}}}

View File

@ -12,6 +12,7 @@
// prototypes {{{
int getKBBrightness(void);
bool setKBBrightness(int);
int main(int, char* []);
enum {
kGetSensorReadingID = 0,
kGetLEDBrightnessID = 1,