ncurses 5.6 - patch 20071222

[ncurses.git] / ncurses / base / lib_slkset.c

diff --git a/ncurses/base/lib_slkset.c b/ncurses/base/lib_slkset.c
index 47ef3823797d08e7ed74316601d70a20e3ae3680..e19f88e60ac4314090a9b334d9715ddd1178d9ac 100644 (file)
--- a/ncurses/base/lib_slkset.c
+++ b/ncurses/base/lib_slkset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -39,15 +39,17 @@
 #include <ctype.h>
 
 #if USE_WIDEC_SUPPORT
+#if HAVE_WCTYPE_H
 #include <wctype.h>
 #endif
+#endif
 
-MODULE_ID("$Id: lib_slkset.c,v 1.15 2005/04/16 17:47:34 tom Exp $")
+MODULE_ID("$Id: lib_slkset.c,v 1.17 2007/10/13 20:08:46 tom Exp $")
 
 NCURSES_EXPORT(int)
 slk_set(int i, const char *astr, int format)
 {
-    SLK *slk = SP->_slk;
+    SLK *slk;
     int offset;
     int numchrs;
     int numcols;
@@ -57,7 +59,12 @@ slk_set(int i, const char *astr, int format)
 
     T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format));
 
-    if (slk == NULL || i < 1 || i > slk->labcnt || format < 0 || format > 2)
+    if (SP == 0
+       || (slk = SP->_slk) == 0
+       || i < 1
+       || i > slk->labcnt
+       || format < 0
+       || format > 2)
        returnCode(ERR);
     if (str == NULL)
        str = "";