diff options
-rw-r--r-- | src/ChangeLog | 14 | ||||
-rw-r--r-- | src/clef/edible.c | 6 | ||||
-rw-r--r-- | src/driver/main.c | 2 | ||||
-rw-r--r-- | src/hyper/ex2ht.c | 2 | ||||
-rw-r--r-- | src/hyper/htadd.c | 4 | ||||
-rw-r--r-- | src/hyper/hthits.c | 4 | ||||
-rw-r--r-- | src/hyper/hyper.c | 4 | ||||
-rw-r--r-- | src/hyper/spadbuf.c | 8 | ||||
-rw-r--r-- | src/sman/session.c | 4 | ||||
-rw-r--r-- | src/sman/sman.c | 2 | ||||
-rw-r--r-- | src/sman/spadclient.c | 4 |
11 files changed, 42 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8f23ad2f..b850bffb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,19 @@ 2009-05-13 Gabriel Dos Reis <gdr@cs.tamu.edu> + Fix SF/2790725 + * driver/main.c (main): Set locale to nothing. + * hyper/ex2ht.c (main): Likewise. + * hyper/htadd.c (main): Likewise. + * hyper/hthits.c (main): Likewise. + * hyper/hyper.c (main): Likewise. + * hyper/spadbuf.c (main): Likewise. + * clef/edible.c (main): Likewise. + * sman/session.c (main): Likewise. + * sman/sman.c (main): Likewise. + * sman/spadclient.c (main): Likewise. + +2009-05-13 Gabriel Dos Reis <gdr@cs.tamu.edu> + * algebra/kl.spad.pamphlet (MakeCachableSet): Remove. * algebra/Makefile.pamphlet (axiom_algebra_layer_6): Don't build it. diff --git a/src/clef/edible.c b/src/clef/edible.c index 65dfac89..e6ec4943 100644 --- a/src/clef/edible.c +++ b/src/clef/edible.c @@ -1,7 +1,7 @@ /* Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd. All rights reserved. - Copyright (C) 2007-2008, Gabriel Dos Reis. + Copyright (C) 2007-2009, Gabriel Dos Reis. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include <sys/time.h> #include <errno.h> #include <signal.h> +#include <locale.h> #include "open-axiom.h" #include "sockio.h" @@ -127,7 +128,8 @@ main(int argc, char *argv[]) int not_command = 1; /* a flag while parsing the command line */ - + + setlocale(LC_ALL, ""); /* try to get a pseudoterminal to play with */ if (ptyopen(&contNum, &serverNum, serverPath) == -1) { perror("ptyopen failed"); diff --git a/src/driver/main.c b/src/driver/main.c index 4d83853a..dd2a040f 100644 --- a/src/driver/main.c +++ b/src/driver/main.c @@ -41,6 +41,7 @@ #include <string.h> #include <errno.h> #include <stdio.h> +#include <locale.h> #include "utils.h" @@ -75,6 +76,7 @@ main(int argc, char* argv[]) openaxiom_driver driver = openaxiom_preprocess_arguments(&command, argc, argv); + setlocale(LC_ALL, ""); switch (driver) { case openaxiom_null_driver: return 0; /* Bye. */ diff --git a/src/hyper/ex2ht.c b/src/hyper/ex2ht.c index b59e505e..fb667e3e 100644 --- a/src/hyper/ex2ht.c +++ b/src/hyper/ex2ht.c @@ -46,6 +46,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> +#include <locale.h> #include "cfuns.h" @@ -266,6 +267,7 @@ main(int argc, char **argv) { int i; + setlocale(LC_ALL, ""); if (argc == 1) { fprintf(stderr, "usage: %s exfile.ht ...\n", argv[0]); return (-1); diff --git a/src/hyper/htadd.c b/src/hyper/htadd.c index 62f7cd7c..46a01416 100644 --- a/src/hyper/htadd.c +++ b/src/hyper/htadd.c @@ -1,7 +1,7 @@ /* Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd. All rights reserved. - Copyright (C) 2007-2008, Gabriel Dos Reis. + Copyright (C) 2007-2009, Gabriel Dos Reis. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include <setjmp.h> #include <stdlib.h> #include <sys/stat.h> +#include <locale.h> #include "cfuns.h" #include "hash.h" @@ -95,6 +96,7 @@ main(int argc, char **argv) char **fnames = filenames; short flag; /* flag for deleting or adding */ + setlocale(LC_ALL, ""); parse_args(argv, db_dir, filenames, &flag); if (!filenames[0]) { diff --git a/src/hyper/hthits.c b/src/hyper/hthits.c index 00b571f8..21223b25 100644 --- a/src/hyper/hthits.c +++ b/src/hyper/hthits.c @@ -1,7 +1,7 @@ /* Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd. All rights reserved. - Copyright (C) 2007-2008, Gabriel Dos Reis. + Copyright (C) 2007-2009, Gabriel Dos Reis. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -60,6 +60,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <regex.h> +#include <locale.h> #include "cfuns.h" @@ -412,6 +413,7 @@ cmdline(int argc, char** argv) int main(int argc, char** argv) { + setlocale(LC_ALL, ""); cmdline(argc, argv); regcomp(®_pattern, pattern, REG_NEWLINE); handleHtdb(); diff --git a/src/hyper/hyper.c b/src/hyper/hyper.c index b6315932..94ce1ab5 100644 --- a/src/hyper/hyper.c +++ b/src/hyper/hyper.c @@ -1,7 +1,7 @@ /* Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd. All rights reserved. - Copyright (C) 2007-2008, Gabriel Dos Reis. + Copyright (C) 2007-2009, Gabriel Dos Reis. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -56,6 +56,7 @@ #include <sys/wait.h> #include <setjmp.h> #include <X11/cursorfont.h> +#include <locale.h> #include "keyin.h" #include "initx.h" @@ -194,6 +195,7 @@ main(int argc, char **argv) /* Initialize some global values */ /* fprintf(stderr,"hyper:main:entered\n");*/ + setlocale(LC_ALL, ""); gArgc = argc; gArgv = argv; gIsEndOfOutput = 1; diff --git a/src/hyper/spadbuf.c b/src/hyper/spadbuf.c index 98c1687a..accf962c 100644 --- a/src/hyper/spadbuf.c +++ b/src/hyper/spadbuf.c @@ -1,7 +1,7 @@ /* Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd. All rights reserved. - Copyright (C) 2007-2008, Gabriel Dos Reis. + Copyright (C) 2007-2009, Gabriel Dos Reis. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -46,6 +46,7 @@ #include <sys/types.h> #include <sys/time.h> #include <signal.h> +#include <locale.h> #include "halloc.h" #include "bsdsignal.h" #include "sockio.h" @@ -212,10 +213,6 @@ init_parent(void) int main(int argc,char ** argv) { - /*int name_found;*/ - /*FILE *junk;*/ - FILE *fopen(); - /* * Modified on 6/13/90 for the command line completion abiltities of * Since I am only calling this program from within spadint, I decided @@ -224,6 +221,7 @@ main(int argc,char ** argv) * spadbuf page_name [completion_ files] * */ + setlocale(LC_ALL, ""); if (argc < 2) { fprintf(stderr, "Usage : spadbuf page_name [completion_files] \n"); exit(-1); diff --git a/src/sman/session.c b/src/sman/session.c index 7cbc375a..0af2581d 100644 --- a/src/sman/session.c +++ b/src/sman/session.c @@ -2,7 +2,7 @@ Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. All rights reserved. - Copyright (C) 2007, Gabriel Dos Reis. + Copyright (C) 2007-2009, Gabriel Dos Reis. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include <stdio.h> #include <string.h> #include <signal.h> +#include <locale.h> #include "open-axiom.h" #include "sockio.h" @@ -469,6 +470,7 @@ main(void) openaxiom_sleep(30); #endif + setlocale(LC_ALL, ""); /* spad_server connects to Lisp server socket read_SpadServer_command handles requests */ spad_server = connect_to_local_server(SpadServer, SessionManager, Forever); diff --git a/src/sman/sman.c b/src/sman/sman.c index 252778eb..f48eb207 100644 --- a/src/sman/sman.c +++ b/src/sman/sman.c @@ -44,6 +44,7 @@ #include <sys/time.h> #include <sys/wait.h> #include <signal.h> +#include <locale.h> #include "open-axiom.h" #include "sockio.h" @@ -782,6 +783,7 @@ main(int argc, char *argv[],char *envp[]) command.root_dir = openaxiom_get_systemdir(argc, argv); process_options(&command, argc, argv); + setlocale(LC_ALL, ""); bsdSignal(SIGINT, SIG_IGN,RestartSystemCalls); init_term_io(); init_spad_process_list(); diff --git a/src/sman/spadclient.c b/src/sman/spadclient.c index f848ac80..24194fe7 100644 --- a/src/sman/spadclient.c +++ b/src/sman/spadclient.c @@ -1,7 +1,7 @@ /* Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd. All rights reserved. - Copyright (C) 2007-2008, Gabriel Dos Reis. + Copyright (C) 2007-2009, Gabriel Dos Reis. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include "sockio.h" #include "com.h" #include "bsdsignal.h" +#include <locale.h> #include "sockio.h" @@ -59,6 +60,7 @@ inter_handler(int sig) int main(void) { + setlocale(LC_ALL, ""); sock = connect_to_local_server(SessionServer, InterpWindow, Forever); bsdSignal(SIGINT, inter_handler,RestartSystemCalls); remote_stdio(sock); |