~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put back the code that ensures "Default Settings" is always in the
[sgt/putty]
/
settings.c
diff --git
a/settings.c
b/settings.c
index
66128a4
..
69394f2
100644
(file)
--- a/
settings.c
+++ b/
settings.c
@@
-338,19
+338,28
@@
void get_sesslist(int allocate) {
buffer = srealloc(buffer, buflen+1);
buffer[buflen] = '\0';
buffer = srealloc(buffer, buflen+1);
buffer[buflen] = '\0';
+ /*
+ * Now set up the list of sessions. Note that "Default
+ * Settings" must always be claimed to exist, even if it
+ * doesn't really.
+ */
+
p = buffer;
p = buffer;
- nsessions =
0;
+ nsessions =
1; /* "Default Settings" counts as one */
while (*p) {
while (*p) {
- nsessions++;
+ if (strcmp(p, "Default Settings"))
+ nsessions++;
while (*p) p++;
p++;
}
while (*p) p++;
p++;
}
- sessions = smalloc(nsessions * sizeof(char *));
+ sessions = smalloc((nsessions+1) * sizeof(char *));
+ sessions[0] = "Default Settings";
p = buffer;
p = buffer;
- i =
0
;
+ i =
1
;
while (*p) {
while (*p) {
- sessions[i++] = p;
+ if (strcmp(p, "Default Settings"))
+ sessions[i++] = p;
while (*p) p++;
p++;
}
while (*p) p++;
p++;
}