projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
48356c9
)
* ignore .swp and .orig files so some more void files won't make it into our template...
author
Wilfried Göesgens
<willi@citadel.org>
Thu, 14 Jan 2010 21:41:32 +0000
(21:41 +0000)
committer
Wilfried Göesgens
<willi@citadel.org>
Thu, 14 Jan 2010 21:41:32 +0000
(21:41 +0000)
webcit/subst.c
patch
|
blob
|
history
diff --git
a/webcit/subst.c
b/webcit/subst.c
index ca2a6975bf4a1f14c0fac585ddb2e1534a5a43c6..a4d8d2aaf06d490e9f835c5e288fb3e36e5e4c87 100644
(file)
--- a/
webcit/subst.c
+++ b/
webcit/subst.c
@@
-1678,7
+1678,7
@@
int LoadTemplateDir(const StrBuf *DirName, HashList *wireless, HashList *big, co
case DT_DIR:
/* Skip directories we are not interested in... */
if (strcmp(filedir_entry->d_name, ".svn") == 0)
case DT_DIR:
/* Skip directories we are not interested in... */
if (strcmp(filedir_entry->d_name, ".svn") == 0)
-
break
;
+
continue
;
FlushStrBuf(SubKey);
if (!Toplevel) {
FlushStrBuf(SubKey);
if (!Toplevel) {
@@
-1705,7
+1705,9
@@
int LoadTemplateDir(const StrBuf *DirName, HashList *wireless, HashList *big, co
d_without_ext --;
if ((d_without_ext == 0) || (d_namelen < 3))
continue;
d_without_ext --;
if ((d_without_ext == 0) || (d_namelen < 3))
continue;
- if ((d_namelen > 1) && filedir_entry->d_name[d_namelen - 1] == '~')
+ if (((d_namelen > 1) && filedir_entry->d_name[d_namelen - 1] == '~') ||
+ (strcmp(&filedir_entry->d_name[d_without_ext], ".orig") == 0) ||
+ (strcmp(&filedir_entry->d_name[d_without_ext], ".swp") == 0))
continue; /* Ignore backup files... */
/* .m.xxx is for mobile useragents! */
if (d_without_ext > 2)
continue; /* Ignore backup files... */
/* .m.xxx is for mobile useragents! */
if (d_without_ext > 2)