sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

r4369: Patch for bug #2190 (SWAT displaying parameters in UNIX charset)

Browse Source 
not utf8. Fixed by Shiro Yamada <shiro@miraclelinux.com>.
Jeremy.
(This used to be commit 8de04888097b3e125845340ba1a9a1bb79892e22)
This commit is contained in:
Jeremy Allison 2004-12-26 18:51:49 +00:00 committed by Gerald (Jerry) Carter
parent 3c1f5a024d
commit 7f98253a67
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source3/web/swat.c
View File

@ -193,6 +193,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
{
int i;
void *ptr = parm->ptr;
char *utf8_s1, *utf8_s2;
if (parm->class == P_LOCAL && snum >= 0) {
ptr = lp_local_ptr(snum, ptr);
@ -214,10 +215,17 @@ static void show_parameter(int snum, struct parm_struct *parm)
char **list = *(char ***)ptr;
for (;*list;list++) {
/* enclose in quotes if the string contains a space */
if ( strchr_m(*list, ' ') )
printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
else
printf("%s%s", *list, ((*(list+1))?", ":""));
if ( strchr_m(*list, ' ') ) {
push_utf8_allocate(&utf8_s1, *list);
push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""));
printf("\'%s\'%s", utf8_s1, utf8_s2);
} else {
push_utf8_allocate(&utf8_s1, *list);
push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""));
printf("%s%s", utf8_s1, utf8_s2);
}
SAFE_FREE(utf8_s1);
SAFE_FREE(utf8_s2);
}
}
printf("\">");
@ -238,16 +246,20 @@ static void show_parameter(int snum, struct parm_struct *parm)
case P_STRING:
case P_USTRING:
push_utf8_allocate(&utf8_s1, *(char **)ptr);
printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
make_parm_name(parm->label), *(char **)ptr);
make_parm_name(parm->label), utf8_s1);
SAFE_FREE(utf8_s1);
printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
break;
case P_GSTRING:
case P_UGSTRING:
push_utf8_allocate(&utf8_s1, (char *)ptr);
printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
make_parm_name(parm->label), (char *)ptr);
make_parm_name(parm->label), utf8_s1);
SAFE_FREE(utf8_s1);
printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
break;