From 1aed01279b27904377b7650e5a8a2d44391119d9 Mon Sep 17 00:00:00 2001 From: dtb Date: Sat, 17 Sep 2022 23:19:09 -0400 Subject: [PATCH] more cleaning --- {include => ascii}/ascii.h | 0 {include => banned}/banned.h | 0 bin/bak | 24 ---------- bin/music | 39 ----------------- bin/transform | 12 ----- bin/translate | 85 ------------------------------------ cstdlib/ctype.c | 55 +++++++++++++++++++++++ cstdlib/ctype.h | 17 ++++++++ {bin => data}/data | 0 {bin => displaym}/displaym | 0 include/ctypef.c | 55 ----------------------- include/ctypef.h | 75 ------------------------------- {bin => packrat}/prat | 0 {bin => rotate}/rotate | 0 {src => sysexits}/sysexits.c | 0 15 files changed, 72 insertions(+), 290 deletions(-) rename {include => ascii}/ascii.h (100%) rename {include => banned}/banned.h (100%) delete mode 100755 bin/bak delete mode 100755 bin/music delete mode 100755 bin/transform delete mode 100755 bin/translate create mode 100644 cstdlib/ctype.c create mode 100644 cstdlib/ctype.h rename {bin => data}/data (100%) rename {bin => displaym}/displaym (100%) delete mode 100644 include/ctypef.c delete mode 100644 include/ctypef.h rename {bin => packrat}/prat (100%) rename {bin => rotate}/rotate (100%) rename {src => sysexits}/sysexits.c (100%) diff --git a/include/ascii.h b/ascii/ascii.h similarity index 100% rename from include/ascii.h rename to ascii/ascii.h diff --git a/include/banned.h b/banned/banned.h similarity index 100% rename from include/banned.h rename to banned/banned.h diff --git a/bin/bak b/bin/bak deleted file mode 100755 index 8ea90ec..0000000 --- a/bin/bak +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -set -e - -argv0="$0" [ -n "$SUFFIX" ] \ - || SUFFIX=".bak" - -shift 1 - -while [ -n "$0" ]; do - if [ -e "$0$SUFFIX" ] && ! [ -d "$0$SUFFIX" ]; then - "$argv0" "$0$SUFFIX" \ - || exit $? - elif [ -d "$0$SUFFIX" ]; then - printf "%s: %s: Cannot bak directories.\n" "$argv0" "$0" 1>&2 - exit 64 # sysexits(3) EX_USAGE - elif ! [ -e "$0" ]; then - printf "%s: %s: File does not exit.\n" "$argv0" "$0" 1>&2 - exit 64 - fi - - mv "$0" "$0$SUFFIX" \ - || exit $? - shift 1 -done diff --git a/bin/music b/bin/music deleted file mode 100755 index 8c91b6e..0000000 --- a/bin/music +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -set -e - -# DistroTube's dm-radio fixed and in POSIX shell - -alias nonzero="test -n" - -nonzero "$MUSIC_PLAYER" || MUSIC_PLAYER=mpv -nonzero "$DMENU" || DMENU=dmenu - -# tab delimits name from URL -STATIONS="\ -50s Rewind https://zeno.fm/radio/50s-rewind/ -60s Rewind https://zeno.fm/radio/60s-rewind/ -70s Rewind https://zeno.fm/radio/70s-rewind/ -80s Rewind https://zeno.fm/radio/80s-rewind/ -90s Rock https://zeno.fm/radio/90s-rock/ -The 2000s https://zeno.fm/radio/the-2000s/ -Classical Radio https://zeno.fm/radio/classical-radio/ -Classical Relaxation https://zeno.fm/radio/radio-christmas-non-stop-classical/ -Classic Rock https://zeno.fm/radio/classic-rockdnb2sav8qs8uv/ -Gangsta49 https://zeno.fm/radio/gangsta49/ -HipHop49 https://zeno.fm/radio/hiphop49/ -Madhouse Country Radio https://zeno.fm/radio/madhouse-country-radio/ -PopMusic https://zeno.fm/radio/popmusic74vyurvmug0uv/ -PopStars https://zeno.fm/radio/popstars/ -RadioMetal https://zeno.fm/radio/radio-metal/ -RocknRoll Radio https://zeno.fm/radio/rocknroll-radio994c7517qs8uv/ -Cancel nop:// -" - -selection="$(printf "%s\n" "$STATIONS" | grep -F "$(printf "%s\n" "$STATIONS" | cut -f 1 | dmenu) ")" - -if [ "$selection" = "Cancel nop://" ] -then exit 0 -fi - -pkill -f http || printf "%s: mpv not running.\n" "$0" 1>&2 -printf "%s\n" "$selection" | cut -f 2 | xargs mpv diff --git a/bin/transform b/bin/transform deleted file mode 100755 index 718e8fc..0000000 --- a/bin/transform +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -argv0="$0" -usage(){ - printf "Usage: %s (un) [XRandR output]\n" "$argv0" 1>&2 - exit 64 # sysexits(3) EX_USAGE -} -if [ -n "$2" ] && [ "$1" = un ] -then xrandr --output "$2" --transform none -elif [ -n "$1" ] -then "$DISPLAYM_CONFIG/xrandr_transform.sh" "$1" -else usage -fi diff --git a/bin/translate b/bin/translate deleted file mode 100755 index f9af8a6..0000000 --- a/bin/translate +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env python3 - -# googletrans comes with a translate(1) command line application but I don't -# like its UI. - -import sys; - -stdin = sys.stdin; -stdout = sys.stdout; -stderr = sys.stderr; - -_exit = exit; -exit = sys.exit; - -def printf(s, *args): - return fprintf(stdout, s, *args); - -def fprintf(f, s, *args): - printing = s if len(args) == 0 else (s % args); - return f.write(printing); - -try: - import googletrans; -except: - printf( - "%s: This Python script requires the \"googletrans\" library.\n", - sys.argv[0] - ); - -def usage(name): - fprintf( - stderr, "Usage: %s [source language] [destination language]\n", - name - ); - exit(1); - -def main(argc, argv): - accepted_languages = set(list(googletrans.LANGCODES) - + list(googletrans.LANGUAGES) + [ "auto" ]); - good = True; - isatty = stdout.isatty(); - translator = googletrans.Translator(); - - if argc != 3: - usage(argv[0]); - - src = argv[1].lower(); - dest = argv[2].lower(); - for arg in [ src, dest ]: - if not(arg in accepted_languages): - good = False; - fprintf(stderr, - "%s: %s: Language not recognized.\n", - argv[0], arg); - if(not(good)): - fprintf(stderr, "The following languages and language codes are" - + " recognized:\n"); - print(googletrans.LANGCODES); - exit(1); - - try: - text = stdin.read().split('\n')[:-1] - except KeyboardInterrupt: - fprintf(stderr, "%s: Cancelled (keyboard interrupt).\n", argv[0]); - exit(1); - for line in text: - try: - translation = translator.translate(line, src=src, dest=dest); - except: - fprintf(stderr, "%s: %s ->%s\n\t%s\n", - argv[0], line, dest, "Error trying to translate."); - if isatty: - fprintf(stdout, - "%s -> %s\n" - + "\t%s -> %s\n" - + "\tGiven pronunciation: %s\n", - translation.origin, translation.text, - translation.src, translation.dest, - translation.pronunciation - ); - else: - fprintf(stdout, "%s\n", translation.text); - return 0; - -exit(main(len(sys.argv), sys.argv)); diff --git a/cstdlib/ctype.c b/cstdlib/ctype.c new file mode 100644 index 0000000..e433b21 --- /dev/null +++ b/cstdlib/ctype.c @@ -0,0 +1,55 @@ +int +isblank(int c){ + return c == '\t' + || c == ' '; +} + +int +isspace(int c){ + return isblank(c) + || c == '\n' + || c == '\v' + || c == '\f' + || c == '\r'; +} + +int +isgraph(int c){ return c >= '!' && c <= '~'; } + +int +isprint(int c){ return c == ' ' || isgraph(c); } + +int +iscntrl(int c){ return !isprint(c); } + +int +isdigit(int c){ return c >= '0' && c <= '9'; } + +int +islower(int c){ return c >= 'a' && c <= 'z'; } + +int +isupper(int c){ return c >= 'A' && c <= 'Z'; } + +int +isxdigit(int c){ + return + isdigit(c) + || (c >= 'a' && c <= 'f') + || (c >= 'A' && c <= 'F'); +} + +int +isalpha(int c){ return islower(c) || isupper(c); } + +int +isalnum(int c){ return isalpha(c) || isdigit(c) }; + +int +ispunct(int c){ return c != ' ' && !isalnum(c) }; + +int +tolower(int c){ return c - isupper(c) * ('A' - 'a'); } + +int +toupper(int c){ return c + islower(c) * ('A' - 'a'); } diff --git a/cstdlib/ctype.h b/cstdlib/ctype.h new file mode 100644 index 0000000..030302b --- /dev/null +++ b/cstdlib/ctype.h @@ -0,0 +1,17 @@ +#ifndef _CTYPE_H +# define CTYPE_H +int isblank(int c); +int isspace(int c); +int isgraph(int c); +int isprint(int c); +int iscntrl(int c); +int isdigit(int c); +int islower(int c); +int isupper(int c); +int isxdigit(int c); +int isalpha(int c); +int isalnum(int c); +int ispunct(int c); +int tolower(int c); +int toupper(int c); +#endif /* ifndef _CTYPE_H */ diff --git a/bin/data b/data/data similarity index 100% rename from bin/data rename to data/data diff --git a/bin/displaym b/displaym/displaym similarity index 100% rename from bin/displaym rename to displaym/displaym diff --git a/include/ctypef.c b/include/ctypef.c deleted file mode 100644 index 9fb3dfb..0000000 --- a/include/ctypef.c +++ /dev/null @@ -1,55 +0,0 @@ -int -_isblank(int c){ - return c == '\t' - || c == ' '; -} - -int -_isspace(int c){ - return isblank(c) - || c == '\n' - || c == '\v' - || c == '\f' - || c == '\r'; -} - -int -_isgraph(int c){ return c >= '!' && c <= '~'; } - -int -_isprint(int c){ return c == ' ' || isgraph(c); } - -int -_iscntrl(int c){ return !isprint(c); } - -int -_isdigit(int c){ return c >= '0' && c <= '9'; } - -int -_islower(int c){ return c >= 'a' && c <= 'z'; } - -int -_isupper(int c){ return c >= 'A' && c <= 'Z'; } - -int -_isxdigit(int c){ - return - isdigit(c) - || (c >= 'a' && c <= 'f') - || (c >= 'A' && c <= 'F'); -} - -int -_isalpha(int c){ return islower(c) || isupper(c); } - -int -_isalnum(int c){ return isalpha(c) || isdigit(c) }; - -int -_ispunct(int c){ return c != ' ' && !isalnum(c) }; - -int -_tolower(int c){ return c - isupper(c) * ('A' - 'a'); } - -int -_toupper(int c){ return c + islower(c) * ('A' - 'a'); } diff --git a/include/ctypef.h b/include/ctypef.h deleted file mode 100644 index 33ba53f..0000000 --- a/include/ctypef.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef _CTYPEF_H -#define _CTYPEF_H -#include - -# ifdef isalnum -# undef isalnum -# define isalnum _isalnum -# endif - -# ifdef isalpha -# undef isalpha -# define isalpha _isalpha -# endif - -# ifdef isblank -# undef isblank -# define isblank _isblank -# endif - -# ifdef iscntrl -# undef iscntrl -# define iscntrl _iscntrl -# endif - -# ifdef isdigit -# undef isdigit -# define isdigit _isdigit -# endif - -# ifdef isxdigit -# undef isxdigit -# define isxdigit _isxdigit -# endif - -# ifdef isgraph -# undef isgraph -# define isgraph _isgraph - -# ifdef islower -# undef islower -# define islower _islower -# endif - -# ifdef isprint -# undef isprint -# define isprint _isprint -# endif - -# ifdef ispunct -# undef ispunct -# define ispunct _ispunct -# endif - -# ifdef isspace -# undef isspace -# define isspace _isspace -# endif - -# ifdef isupper -# undef isupper -# define isupper _isupper -# endif - -# ifdef tolower -# undef tolower -# define tolower _tolower -# endif - -# ifdef toupper -# undef toupper -# define toupper _toupper -# endif - -#include "ctypef.c" -#endif diff --git a/bin/prat b/packrat/prat similarity index 100% rename from bin/prat rename to packrat/prat diff --git a/bin/rotate b/rotate/rotate similarity index 100% rename from bin/rotate rename to rotate/rotate diff --git a/src/sysexits.c b/sysexits/sysexits.c similarity index 100% rename from src/sysexits.c rename to sysexits/sysexits.c