Page MenuHomeFreeBSD
Differential D32945 Diff 98370 usr.bin/uuencode/bin2text2bin.c

Changeset View

Standalone View

View Options

usr.bin/uuencode/bin2text2bin.c

Show All 21 Lines
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <libgen.h> #include <libgen.h>
#include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
extern int main_decode(int, char *[]); extern int main_decode(int, char *[]);
extern int main_encode(int, char *[]); extern int main_encode(int, char *[]);
static int search(const char *const); static int search(const char *const);
enum coders { enum coders {
uuencode, uudecode, b64encode, b64decode uuencode, uudecode, b64encode, b64decode, base64
}; };
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
const char *const progname = basename(argv[0]); const char *const progname = basename(argv[0]);
int coder = search(progname); int coder = search(progname);
if (coder == -1 && argc > 1) { if (coder == -1 && argc > 1) {
argc--; argc--;
argv++; argv++;
coder = search(basename(argv[0])); coder = search(basename(argv[0]));
} }
switch (coder) { switch (coder) {
case uuencode: case uuencode:
case b64encode: case b64encode:
main_encode(argc, argv); main_encode(argc, argv);
break; break;
case uudecode: case uudecode:
case b64decode: case b64decode:
main_decode(argc, argv); main_decode(argc, argv);
break; break;
case base64: {
int ch;
int nargc;
char *nargv[8] = {NULL};
bool decode = false;
nargc = 0;
nargv[nargc++] = (char []){"base64"};
nargv[nargc++] = (char []){"-r"};
nargv[nargc++] = (char []){"-m"};
while ((ch = getopt(argc, argv, "dw:")) != -1)
if (ch == 'd')
decode = true;
else if (ch == 'w') {
nargv[nargc++] = (char []){"-w"};
nargv[nargc++] = optarg;
}
else {
(void)fprintf(stderr,
"usage: base64 [-w col] [-d] [FILE]\n");
exit(EXIT_FAILURE);
}
if (argv[optind] != NULL)
nargv[nargc++] = argv[optind];
else
nargv[nargc++] = (char []){"/dev/stdin"};
optreset = optind = 1;
if (decode)
main_decode(nargc, nargv);
else {
nargv[nargc++] = (char []){"/dev/stdout"};
main_encode(nargc, nargv);
}
}
default: default:
(void)fprintf(stderr, (void)fprintf(stderr,
"usage: %s <uuencode | uudecode> ...\n" "usage: %s <uuencode | uudecode | base64> ...\n"
" %s <b64encode | b64decode> ...\n", " %s <b64encode | b64decode | base64> ...\n",
progname, progname); progname, progname);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
static int static int
search(const char *const progname) search(const char *const progname)
{ {
#define DESIGNATE(item) [item] = #item #define DESIGNATE(item) [item] = #item
const char *const known[] = { const char *const known[] = {
DESIGNATE(uuencode), DESIGNATE(uuencode),
DESIGNATE(uudecode), DESIGNATE(uudecode),
DESIGNATE(b64encode), DESIGNATE(b64encode),
DESIGNATE(b64decode) DESIGNATE(b64decode),
DESIGNATE(base64)
}; };
for (size_t i = 0; i < nitems(known); i++) for (size_t i = 0; i < nitems(known); i++)
if (strcmp(progname, known[i]) == 0) if (strcmp(progname, known[i]) == 0)
return ((int)i); return ((int)i);
return (-1); return (-1);
} }
delphijUnsubmitted
Not Done
Inline Actions

Could you please replace magic numbers here (-2 and -3 below) with symbolic names instead? This would help readers to better understanding their meanings.

Usually this is done by defining an enum like:

enum base64_options
{
    OPTION_BASE64_HELP = -2;
    OPTION_BASE64_VERSION = -3;
};

(Personally I'd probably just use 1 and 2 here)

delphij: Could you please replace magic numbers here (`-2` and `-3` below) with symbolic names instead?
pstefAuthorUnsubmitted
Done
Inline Actions

I'll think about what I can do here. The cryptic values were intentional, to limit the number of places you have to update when adding a new option. With getopt_long() it's usually 3: enums, optstring and longopts. It's less with getopt_long_only() since you can omit optstring, and short options work as they're recognized as a prefix of the long option - but that's asking for trouble.

pstef: I'll think about what I can do here. The cryptic values were intentional, to limit the number…
delphijUnsubmitted
Not Done
Inline Actions

Please replace this block with a switch/case block.

delphij: Please replace this block with a switch/case block.
pstefAuthorUnsubmitted
Done
Inline Actions

In some incarnations of this loop, I checked for ch < -1 or similar. If I make this a switch and decide to revisit that idea later, I would have to convert the switch again.

pstef: In some incarnations of this loop, I checked for ch < -1 or similar. If I make this a switch…
delphijUnsubmitted
Not Done
Inline Actions

Please extract this into a static function instead of implementing it here.

It would be nice if we can do something more descriptive (e.g. FreeBSD base64(1) or even FreeBSD base64 version X.XXinstead of just FreeBSD as the latter might be surprising for users) by the way.

delphij: Please extract this into a static function instead of implementing it here. It would be nice…
pstefAuthorUnsubmitted
Done
Inline Actions

I thought making this a function wasn't worth the effort as it would only have 1 place calling it.

I didn't want to write anything more because I would have to set a new tradition of version numbering of this program that never had it before. The option only exists so that using it is recognized and doesn't invoke an error.

pstef: I thought making this a function wasn't worth the effort as it would only have 1 place calling…
delphijUnsubmitted
Not Done
Inline Actions

Please extract this to a static function e.g. usage_base64().

delphij: Please extract this to a static function e.g. `usage_base64()`.
pstefAuthorUnsubmitted
Done
Inline Actions

I can do that, but is it worth it, though? Only one place would call it.

pstef: I can do that, but is it worth it, though? Only one place would call it.