From 5618536d0bedc2c3046ec600d9f87b412a9ca376 Mon Sep 17 00:00:00 2001 From: Stefan Farfeleder Date: Sun, 3 Oct 2004 15:34:15 +0000 Subject: [PATCH] Properly initialise 'filename' so that random -l doesn't try to open NULL. Const-qualify 'filename' to avoid a strdup() call due to -Wwrite-strings silliness. --- games/random/random.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/games/random/random.c b/games/random/random.c index e7c85bb59ac5..e06c4bc68fd5 100644 --- a/games/random/random.c +++ b/games/random/random.c @@ -70,10 +70,11 @@ main(int argc, char *argv[]) double denom; int ch, fd, random_exit, randomize_lines, random_type, ret, selected, unique_output, unbuffer_output; - char *ep, *filename; + char *ep; + const char *filename; denom = 0; - filename = NULL; + filename = "/dev/fd/0"; random_type = RANDOM_TYPE_UNSET; random_exit = randomize_lines = random_type = unbuffer_output = 0; unique_output = 1; @@ -84,9 +85,7 @@ main(int argc, char *argv[]) break; case 'f': randomize_lines = 1; - if (!strcmp(optarg, "-")) - filename = strdup("/dev/fd/0"); - else + if (strcmp(optarg, "-") != 0) filename = optarg; break; case 'l':