Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
8d12fef6
Commit
8d12fef6
authored
19 years ago
by
deuce
Browse files
Options
Downloads
Patches
Plain Diff
Use alloc() instead of malloc()/free() where possible.
parent
45f32f3c
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/sbbs3/uedit/uedit.c
+36
-61
36 additions, 61 deletions
src/sbbs3/uedit/uedit.c
with
36 additions
and
61 deletions
src/sbbs3/uedit/uedit.c
+
36
−
61
View file @
8d12fef6
...
@@ -129,16 +129,6 @@ void allocfail(uint size)
...
@@ -129,16 +129,6 @@ void allocfail(uint size)
bail
(
1
);
bail
(
1
);
}
}
void
freeopt
(
char
**
opt
)
{
int
i
;
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
free
(
opt
[
i
]);
free
(
opt
);
}
int
confirm
(
char
*
prompt
)
int
confirm
(
char
*
prompt
)
{
{
int
i
=
0
;
int
i
=
0
;
...
@@ -239,10 +229,10 @@ int edit_terminal(scfg_t *cfg, user_t *user)
...
@@ -239,10 +229,10 @@ int edit_terminal(scfg_t *cfg, user_t *user)
char
**
opt
;
char
**
opt
;
char
str
[
256
];
char
str
[
256
];
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
j
=
0
;
j
=
0
;
...
@@ -263,7 +253,6 @@ int edit_terminal(scfg_t *cfg, user_t *user)
...
@@ -263,7 +253,6 @@ int edit_terminal(scfg_t *cfg, user_t *user)
opt
[
i
][
0
]
=
0
;
opt
[
i
][
0
]
=
0
;
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Terminal Settings"
,
opt
))
{
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Terminal Settings"
,
opt
))
{
case
-
1
:
case
-
1
:
freeopt
(
opt
);
return
(
0
);
return
(
0
);
break
;
break
;
case
0
:
case
0
:
...
@@ -338,10 +327,10 @@ int edit_logon(scfg_t *cfg, user_t *user)
...
@@ -338,10 +327,10 @@ int edit_logon(scfg_t *cfg, user_t *user)
char
**
opt
;
char
**
opt
;
char
str
[
256
];
char
str
[
256
];
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
j
=
0
;
j
=
0
;
...
@@ -356,7 +345,6 @@ int edit_logon(scfg_t *cfg, user_t *user)
...
@@ -356,7 +345,6 @@ int edit_logon(scfg_t *cfg, user_t *user)
opt
[
i
][
0
]
=
0
;
opt
[
i
][
0
]
=
0
;
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Logon Settings"
,
opt
))
{
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Logon Settings"
,
opt
))
{
case
-
1
:
case
-
1
:
freeopt
(
opt
);
return
(
0
);
return
(
0
);
break
;
break
;
case
0
:
case
0
:
...
@@ -402,10 +390,10 @@ int edit_chat(scfg_t *cfg, user_t *user)
...
@@ -402,10 +390,10 @@ int edit_chat(scfg_t *cfg, user_t *user)
char
**
opt
;
char
**
opt
;
char
str
[
256
];
char
str
[
256
];
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
j
=
0
;
j
=
0
;
...
@@ -420,7 +408,6 @@ int edit_chat(scfg_t *cfg, user_t *user)
...
@@ -420,7 +408,6 @@ int edit_chat(scfg_t *cfg, user_t *user)
opt
[
i
][
0
]
=
0
;
opt
[
i
][
0
]
=
0
;
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Chat Settings"
,
opt
))
{
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Chat Settings"
,
opt
))
{
case
-
1
:
case
-
1
:
freeopt
(
opt
);
return
(
0
);
return
(
0
);
break
;
break
;
case
0
:
case
0
:
...
@@ -460,7 +447,7 @@ int edit_shell(scfg_t *cfg, user_t *user)
...
@@ -460,7 +447,7 @@ int edit_shell(scfg_t *cfg, user_t *user)
int
i
,
j
;
int
i
,
j
;
char
**
opt
;
char
**
opt
;
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
...
@@ -479,7 +466,6 @@ int edit_shell(scfg_t *cfg, user_t *user)
...
@@ -479,7 +466,6 @@ int edit_shell(scfg_t *cfg, user_t *user)
}
}
break
;
break
;
}
}
free
(
opt
);
return
(
0
);
return
(
0
);
}
}
...
@@ -493,10 +479,10 @@ int edit_cmd(scfg_t *cfg, user_t *user)
...
@@ -493,10 +479,10 @@ int edit_cmd(scfg_t *cfg, user_t *user)
char
**
opt
;
char
**
opt
;
char
str
[
256
];
char
str
[
256
];
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
j
=
0
;
j
=
0
;
...
@@ -508,7 +494,6 @@ int edit_cmd(scfg_t *cfg, user_t *user)
...
@@ -508,7 +494,6 @@ int edit_cmd(scfg_t *cfg, user_t *user)
opt
[
i
][
0
]
=
0
;
opt
[
i
][
0
]
=
0
;
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Command Shell"
,
opt
))
{
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Command Shell"
,
opt
))
{
case
-
1
:
case
-
1
:
freeopt
(
opt
);
return
(
0
);
return
(
0
);
break
;
break
;
case
0
:
case
0
:
...
@@ -532,7 +517,7 @@ int edit_xedit(scfg_t *cfg, user_t *user)
...
@@ -532,7 +517,7 @@ int edit_xedit(scfg_t *cfg, user_t *user)
int
i
,
j
;
int
i
,
j
;
char
**
opt
;
char
**
opt
;
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
getuserdat
(
cfg
,
user
);
getuserdat
(
cfg
,
user
);
...
@@ -555,7 +540,6 @@ int edit_xedit(scfg_t *cfg, user_t *user)
...
@@ -555,7 +540,6 @@ int edit_xedit(scfg_t *cfg, user_t *user)
}
}
break
;
break
;
}
}
free
(
opt
);
return
(
0
);
return
(
0
);
}
}
...
@@ -570,10 +554,10 @@ int edit_msgopts(scfg_t *cfg, user_t *user)
...
@@ -570,10 +554,10 @@ int edit_msgopts(scfg_t *cfg, user_t *user)
char
**
opt
;
char
**
opt
;
char
str
[
256
];
char
str
[
256
];
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
j
=
0
;
j
=
0
;
...
@@ -586,7 +570,6 @@ int edit_msgopts(scfg_t *cfg, user_t *user)
...
@@ -586,7 +570,6 @@ int edit_msgopts(scfg_t *cfg, user_t *user)
opt
[
i
][
0
]
=
0
;
opt
[
i
][
0
]
=
0
;
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Message Options"
,
opt
))
{
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Message Options"
,
opt
))
{
case
-
1
:
case
-
1
:
freeopt
(
opt
);
return
(
0
);
return
(
0
);
break
;
break
;
case
0
:
case
0
:
...
@@ -615,7 +598,7 @@ int edit_tmpqwktype(scfg_t *cfg, user_t *user)
...
@@ -615,7 +598,7 @@ int edit_tmpqwktype(scfg_t *cfg, user_t *user)
int
j
=
0
;
int
j
=
0
;
char
**
opt
;
char
**
opt
;
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
getuserdat
(
cfg
,
user
);
getuserdat
(
cfg
,
user
);
...
@@ -635,7 +618,6 @@ int edit_tmpqwktype(scfg_t *cfg, user_t *user)
...
@@ -635,7 +618,6 @@ int edit_tmpqwktype(scfg_t *cfg, user_t *user)
}
}
break
;
break
;
}
}
free
(
opt
);
return
(
0
);
return
(
0
);
}
}
...
@@ -658,10 +640,10 @@ int edit_qwk(scfg_t *cfg, user_t *user)
...
@@ -658,10 +640,10 @@ int edit_qwk(scfg_t *cfg, user_t *user)
char
**
opt
;
char
**
opt
;
char
str
[
256
];
char
str
[
256
];
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
j
=
0
;
j
=
0
;
...
@@ -686,7 +668,6 @@ int edit_qwk(scfg_t *cfg, user_t *user)
...
@@ -686,7 +668,6 @@ int edit_qwk(scfg_t *cfg, user_t *user)
opt
[
i
][
0
]
=
0
;
opt
[
i
][
0
]
=
0
;
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Command Shell"
,
opt
))
{
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"Command Shell"
,
opt
))
{
case
-
1
:
case
-
1
:
freeopt
(
opt
);
return
(
0
);
return
(
0
);
break
;
break
;
case
0
:
case
0
:
...
@@ -776,7 +757,7 @@ int edit_proto(scfg_t *cfg, user_t *user)
...
@@ -776,7 +757,7 @@ int edit_proto(scfg_t *cfg, user_t *user)
int
j
=
0
;
int
j
=
0
;
char
**
opt
;
char
**
opt
;
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
getuserdat
(
cfg
,
user
);
getuserdat
(
cfg
,
user
);
...
@@ -802,7 +783,6 @@ int edit_proto(scfg_t *cfg, user_t *user)
...
@@ -802,7 +783,6 @@ int edit_proto(scfg_t *cfg, user_t *user)
}
}
break
;
break
;
}
}
free
(
opt
);
return
(
0
);
return
(
0
);
}
}
...
@@ -821,10 +801,10 @@ int edit_fileopts(scfg_t *cfg, user_t *user)
...
@@ -821,10 +801,10 @@ int edit_fileopts(scfg_t *cfg, user_t *user)
char
**
opt
;
char
**
opt
;
char
str
[
256
];
char
str
[
256
];
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
j
=
0
;
j
=
0
;
...
@@ -844,7 +824,6 @@ int edit_fileopts(scfg_t *cfg, user_t *user)
...
@@ -844,7 +824,6 @@ int edit_fileopts(scfg_t *cfg, user_t *user)
opt
[
i
][
0
]
=
0
;
opt
[
i
][
0
]
=
0
;
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"File Options"
,
opt
))
{
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
|
WIN_SAV
,
0
,
0
,
0
,
&
j
,
0
,
"File Options"
,
opt
))
{
case
-
1
:
case
-
1
:
freeopt
(
opt
);
return
(
0
);
return
(
0
);
break
;
break
;
case
0
:
case
0
:
...
@@ -996,10 +975,10 @@ int edit_stats(scfg_t *cfg, user_t *user)
...
@@ -996,10 +975,10 @@ int edit_stats(scfg_t *cfg, user_t *user)
char
str
[
256
];
char
str
[
256
];
time_t
temptime
,
temptime2
;
time_t
temptime
,
temptime2
;
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
j
=
0
;
j
=
0
;
...
@@ -1029,7 +1008,6 @@ int edit_stats(scfg_t *cfg, user_t *user)
...
@@ -1029,7 +1008,6 @@ int edit_stats(scfg_t *cfg, user_t *user)
opt
[
i
][
0
]
=
0
;
opt
[
i
][
0
]
=
0
;
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
,
0
,
0
,
0
,
&
j
,
0
,
"Statistics"
,
opt
))
{
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
,
0
,
0
,
0
,
&
j
,
0
,
"Statistics"
,
opt
))
{
case
-
1
:
case
-
1
:
freeopt
(
opt
);
return
(
0
);
return
(
0
);
break
;
break
;
case
0
:
case
0
:
...
@@ -1280,10 +1258,10 @@ int edit_security(scfg_t *cfg, user_t *user)
...
@@ -1280,10 +1258,10 @@ int edit_security(scfg_t *cfg, user_t *user)
char
**
opt
;
char
**
opt
;
char
str
[
256
];
char
str
[
256
];
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
j
=
0
;
j
=
0
;
...
@@ -1304,7 +1282,6 @@ int edit_security(scfg_t *cfg, user_t *user)
...
@@ -1304,7 +1282,6 @@ int edit_security(scfg_t *cfg, user_t *user)
opt
[
i
][
0
]
=
0
;
opt
[
i
][
0
]
=
0
;
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
,
0
,
0
,
0
,
&
j
,
0
,
"Security Settings"
,
opt
))
{
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
,
0
,
0
,
0
,
&
j
,
0
,
"Security Settings"
,
opt
))
{
case
-
1
:
case
-
1
:
freeopt
(
opt
);
return
(
0
);
return
(
0
);
break
;
break
;
case
0
:
case
0
:
...
@@ -1449,10 +1426,10 @@ int edit_personal(scfg_t *cfg, user_t *user)
...
@@ -1449,10 +1426,10 @@ int edit_personal(scfg_t *cfg, user_t *user)
char
onech
[
2
];
char
onech
[
2
];
char
str
[
256
];
char
str
[
256
];
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
j
=
0
;
j
=
0
;
...
@@ -1478,7 +1455,6 @@ int edit_personal(scfg_t *cfg, user_t *user)
...
@@ -1478,7 +1455,6 @@ int edit_personal(scfg_t *cfg, user_t *user)
uifc
.
changes
=
FALSE
;
uifc
.
changes
=
FALSE
;
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
,
0
,
0
,
0
,
&
j
,
0
,
"Personal Settings"
,
opt
))
{
switch
(
uifc
.
list
(
WIN_MID
|
WIN_ACT
,
0
,
0
,
0
,
&
j
,
0
,
"Personal Settings"
,
opt
))
{
case
-
1
:
case
-
1
:
freeopt
(
opt
);
return
(
0
);
return
(
0
);
case
0
:
case
0
:
/* Real Name */
/* Real Name */
...
@@ -1608,10 +1584,10 @@ int edit_user(scfg_t *cfg, int usernum)
...
@@ -1608,10 +1584,10 @@ int edit_user(scfg_t *cfg, int usernum)
user_t
user
;
user_t
user
;
char
str
[
256
];
char
str
[
256
];
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
user
.
number
=
usernum
;
user
.
number
=
usernum
;
...
@@ -1639,7 +1615,6 @@ int edit_user(scfg_t *cfg, int usernum)
...
@@ -1639,7 +1615,6 @@ int edit_user(scfg_t *cfg, int usernum)
sprintf
(
str
,
"Edit User: %d (%s)"
,
user
.
number
,
user
.
name
[
0
]
?
user
.
name
:
user
.
alias
);
sprintf
(
str
,
"Edit User: %d (%s)"
,
user
.
number
,
user
.
name
[
0
]
?
user
.
name
:
user
.
alias
);
switch
(
uifc
.
list
(
WIN_ORG
|
WIN_ACT
,
0
,
0
,
0
,
&
j
,
0
,
str
,
opt
))
{
switch
(
uifc
.
list
(
WIN_ORG
|
WIN_ACT
,
0
,
0
,
0
,
&
j
,
0
,
str
,
opt
))
{
case
-
1
:
case
-
1
:
freeopt
(
opt
);
return
(
0
);
return
(
0
);
case
0
:
case
0
:
...
@@ -1693,7 +1668,7 @@ int finduser(scfg_t *cfg, user_t *user)
...
@@ -1693,7 +1668,7 @@ int finduser(scfg_t *cfg, user_t *user)
struct
user_list
**
opt
;
struct
user_list
**
opt
;
int
done
=
0
;
int
done
=
0
;
if
((
opt
=
(
struct
user_list
**
)
m
alloc
(
sizeof
(
struct
user_list
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
struct
user_list
**
)
alloc
a
(
sizeof
(
struct
user_list
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
struct
user_list
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
struct
user_list
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
opt
[
i
]
=
NULL
;
opt
[
i
]
=
NULL
;
...
@@ -1711,13 +1686,13 @@ int finduser(scfg_t *cfg, user_t *user)
...
@@ -1711,13 +1686,13 @@ int finduser(scfg_t *cfg, user_t *user)
getuserdat
(
cfg
,
user
);
getuserdat
(
cfg
,
user
);
if
(
strcasestr
(
user
->
alias
,
str
)
!=
NULL
||
strcasestr
(
user
->
name
,
str
)
!=
NULL
||
strcasestr
(
user
->
handle
,
str
)
!=
NULL
if
(
strcasestr
(
user
->
alias
,
str
)
!=
NULL
||
strcasestr
(
user
->
name
,
str
)
!=
NULL
||
strcasestr
(
user
->
handle
,
str
)
!=
NULL
||
user
->
number
==
un
)
{
||
user
->
number
==
un
)
{
if
((
opt
[
j
]
=
(
struct
user_list
*
)
m
alloc
(
sizeof
(
struct
user_list
)))
==
NULL
)
if
((
opt
[
j
]
=
(
struct
user_list
*
)
alloc
a
(
sizeof
(
struct
user_list
)))
==
NULL
)
allocfail
(
sizeof
(
struct
user_list
));
allocfail
(
sizeof
(
struct
user_list
));
sprintf
(
opt
[
j
]
->
info
,
"%1.1s%1.1s %-25.25s %-25.25s"
,
user
->
misc
&
DELETED
?
"*"
:
" "
,
user
->
misc
&
INACTIVE
?
"*"
:
" "
,
user
->
name
,
user
->
alias
);
sprintf
(
opt
[
j
]
->
info
,
"%1.1s%1.1s %-25.25s %-25.25s"
,
user
->
misc
&
DELETED
?
"*"
:
" "
,
user
->
misc
&
INACTIVE
?
"*"
:
" "
,
user
->
name
,
user
->
alias
);
opt
[
j
++
]
->
usernum
=
i
;
opt
[
j
++
]
->
usernum
=
i
;
}
}
}
}
if
((
opt
[
j
]
=
(
struct
user_list
*
)
m
alloc
(
sizeof
(
struct
user_list
)))
==
NULL
)
if
((
opt
[
j
]
=
(
struct
user_list
*
)
alloc
a
(
sizeof
(
struct
user_list
)))
==
NULL
)
allocfail
(
sizeof
(
struct
user_list
));
allocfail
(
sizeof
(
struct
user_list
));
opt
[
j
]
->
info
[
0
]
=
0
;
opt
[
j
]
->
info
[
0
]
=
0
;
i
=
0
;
i
=
0
;
...
@@ -1743,7 +1718,7 @@ int getuser(scfg_t *cfg, user_t *user, char* str)
...
@@ -1743,7 +1718,7 @@ int getuser(scfg_t *cfg, user_t *user, char* str)
struct
user_list
**
opt
;
struct
user_list
**
opt
;
int
done
=
0
;
int
done
=
0
;
if
((
opt
=
(
struct
user_list
**
)
m
alloc
(
sizeof
(
struct
user_list
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
struct
user_list
**
)
alloc
a
(
sizeof
(
struct
user_list
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
struct
user_list
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
struct
user_list
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
opt
[
i
]
=
NULL
;
opt
[
i
]
=
NULL
;
...
@@ -1757,13 +1732,13 @@ int getuser(scfg_t *cfg, user_t *user, char* str)
...
@@ -1757,13 +1732,13 @@ int getuser(scfg_t *cfg, user_t *user, char* str)
user
->
number
=
i
;
user
->
number
=
i
;
getuserdat
(
cfg
,
user
);
getuserdat
(
cfg
,
user
);
if
(
strcasestr
(
user
->
alias
,
str
)
!=
NULL
||
strcasestr
(
user
->
name
,
str
)
!=
NULL
||
strcasestr
(
user
->
handle
,
str
)
!=
NULL
)
{
if
(
strcasestr
(
user
->
alias
,
str
)
!=
NULL
||
strcasestr
(
user
->
name
,
str
)
!=
NULL
||
strcasestr
(
user
->
handle
,
str
)
!=
NULL
)
{
if
((
opt
[
j
]
=
(
struct
user_list
*
)
m
alloc
(
sizeof
(
struct
user_list
)))
==
NULL
)
if
((
opt
[
j
]
=
(
struct
user_list
*
)
alloc
a
(
sizeof
(
struct
user_list
)))
==
NULL
)
allocfail
(
sizeof
(
struct
user_list
));
allocfail
(
sizeof
(
struct
user_list
));
sprintf
(
opt
[
j
]
->
info
,
"%1.1s%1.1s %-25.25s %-25.25s"
,
user
->
misc
&
DELETED
?
"*"
:
" "
,
user
->
misc
&
INACTIVE
?
"*"
:
" "
,
user
->
name
,
user
->
alias
);
sprintf
(
opt
[
j
]
->
info
,
"%1.1s%1.1s %-25.25s %-25.25s"
,
user
->
misc
&
DELETED
?
"*"
:
" "
,
user
->
misc
&
INACTIVE
?
"*"
:
" "
,
user
->
name
,
user
->
alias
);
opt
[
j
++
]
->
usernum
=
i
;
opt
[
j
++
]
->
usernum
=
i
;
}
}
}
}
if
((
opt
[
j
]
=
(
struct
user_list
*
)
m
alloc
(
sizeof
(
struct
user_list
)))
==
NULL
)
if
((
opt
[
j
]
=
(
struct
user_list
*
)
alloc
a
(
sizeof
(
struct
user_list
)))
==
NULL
)
allocfail
(
sizeof
(
struct
user_list
));
allocfail
(
sizeof
(
struct
user_list
));
opt
[
j
]
->
info
[
0
]
=
0
;
opt
[
j
]
->
info
[
0
]
=
0
;
i
=
0
;
i
=
0
;
...
@@ -2046,16 +2021,16 @@ int main(int argc, char** argv) {
...
@@ -2046,16 +2021,16 @@ int main(int argc, char** argv) {
exit
(
1
);
exit
(
1
);
}
}
if
((
opt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
if
((
opt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
)))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
allocfail
(
sizeof
(
char
*
)
*
(
MAX_OPTS
+
1
));
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
for
(
i
=
0
;
i
<
(
MAX_OPTS
+
1
);
i
++
)
if
((
opt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
opt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
if
((
mopt
=
(
char
**
)
m
alloc
(
sizeof
(
char
*
)
*
MAX_OPTS
))
==
NULL
)
if
((
mopt
=
(
char
**
)
alloc
a
(
sizeof
(
char
*
)
*
MAX_OPTS
))
==
NULL
)
allocfail
(
sizeof
(
char
*
)
*
MAX_OPTS
);
allocfail
(
sizeof
(
char
*
)
*
MAX_OPTS
);
for
(
i
=
0
;
i
<
MAX_OPTS
;
i
++
)
for
(
i
=
0
;
i
<
MAX_OPTS
;
i
++
)
if
((
mopt
[
i
]
=
(
char
*
)
m
alloc
(
MAX_OPLN
))
==
NULL
)
if
((
mopt
[
i
]
=
(
char
*
)
alloc
a
(
MAX_OPLN
))
==
NULL
)
allocfail
(
MAX_OPLN
);
allocfail
(
MAX_OPLN
);
sprintf
(
title
,
"Synchronet User Editor %s-%s"
,
revision
,
PLATFORM_DESC
);
sprintf
(
title
,
"Synchronet User Editor %s-%s"
,
revision
,
PLATFORM_DESC
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment