Handle strange characters in filenames properly.

diff --git a/skelrc.h b/skelrc.h
index 444af4d9b72bcaf25ae7db2d93f7c40ffd938a1e..b46eb71775ecc39e721a4eacd80880ded0f54668 100644 (file)
--- a/skelrc.h
+++ b/skelrc.h
@@ -2,10 +2,19 @@
 
 (skel-include "skelrc.c")
 
 
 (skel-include "skelrc.c")
 

+(defun skelrc-c-sanitize-guard (s)
+  (setq s (copy-sequence s))
+  (let ((i 0) (l (length s)))
+    (while (< i l)
+      (let ((c (aref s i)))
+       (aset s i (if (eq (char-syntax c) ?w) (upcase c) ?_)))
+      (setq i (1+ i))))
+  s)
+

 (defun skelrc-c-guard-name ()
   (if buffer-file-name
 (defun skelrc-c-guard-name ()
   (if buffer-file-name

-      (upcase (file-name-sans-extension (file-name-nondirectory
-                                        buffer-file-name)))
+      (skelrc-c-sanitize-guard
+       (file-name-sans-extension (file-name-nondirectory buffer-file-name)))

     (skel-lookup 'include-guard-name)))
 
 (setq skel-alist
     (skel-lookup 'include-guard-name)))
 
 (setq skel-alist