diff options
Diffstat (limited to 'src/daisy-player.c')
| -rw-r--r-- | src/daisy-player.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/daisy-player.c b/src/daisy-player.c index ea52d00..bd23853 100644 --- a/src/daisy-player.c +++ b/src/daisy-player.c @@ -19,7 +19,7 @@ #include "src/daisy.h" -#define DAISY_PLAYER_VERSION "8.4.1" +#define DAISY_PLAYER_VERSION "8.4.3" int discinfo = 0, displaying = 0, phrase_nr, tts_no; int playing, just_this_item, current_playorder = 1, audiocd; @@ -2015,12 +2015,8 @@ int main (int argc, char *argv[]) strncpy (cd_dev, "/dev/sr0", 15); atexit (quit_daisy_player); read_rc (); - setlocale (LC_ALL, getenv ("LC_ALL")); - setlocale (LC_ALL, getenv ("LANGUAGE")); - setlocale (LC_ALL, getenv ("LANG")); - textdomain (prog_name); - snprintf (str, MAX_STR, "%s/", LOCALEDIR); - bindtextdomain (prog_name, str); + setlocale (LC_ALL, ""); + setlocale (LC_NUMERIC, "C"); textdomain (prog_name); opterr = 0; while ((opt = getopt (argc, argv, "c:d:ny")) != -1) @@ -2192,8 +2188,7 @@ int main (int argc, char *argv[]) // when no mount-point is given try to mount the cd { FILE *r; - char *str, cd[MAX_STR + 1]; - size_t s; + char cd[MAX_STR + 1]; double start; magic_t myt; @@ -2254,6 +2249,11 @@ int main (int argc, char *argv[]) r = fopen ("/run/udev/data/b11:0", "r"); while (1) { + char *str;; + size_t s; + + str = (char *) malloc (MAX_STR); + s = MAX_STR - 1; switch (getline (&str, &s, r)) { default: |