mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-08-24 18:25:50 +00:00
Fix code that was using <ctype.h> functions and passing char's rather than
* components/help/converters/gnome-info2html2/html.c: (write_menu_entry_html): * components/help/converters/gnome-man2html2/gnome-man2html.c: (add_links), (scan_escape), (scan_format), (scan_table), (scan_expression), (scan_request), (scan_troff), (scan_troff_mandoc), (main): * src/nautilus-first-time-druid.c: (load_netscape_proxy_settings): * src/nautilus-property-browser.c: (emblem_keyword_valid): Fix code that was using <ctype.h> functions and passing char's rather than int's (using the standard "cast to unsigned char" trick). * libnautilus-private/nautilus-file.c: (nautilus_file_denies_access_permission), (nautilus_file_can_set_permissions), (nautilus_file_set_owner), (nautilus_file_get_group_name), (nautilus_file_can_set_group), (nautilus_file_get_settable_group_names), (nautilus_file_set_group): Get rid of the assumption that GnomeVFSFileInfo field types match the platform-specific uid_t and gid_t. This involves doing a few more type casts. (nautilus_extract_top_left_text): Fix a use of isprint on a char rather than an int. * libnautilus-private/nautilus-volume-monitor.c: Added ifdefs so this file can compile for Solaris without warnings. * test/test.c: (test_window_set_title_with_pid): Don't assume that getpid() returns an int. Instead cast it to unsigned long for printing.
This commit is contained in:
parent
a2146ea844
commit
800e4fc159
33
ChangeLog
33
ChangeLog
|
@ -1,3 +1,36 @@
|
||||||
|
2001-07-11 Darin Adler <darin@bentspoon.com>
|
||||||
|
|
||||||
|
* components/help/converters/gnome-info2html2/html.c:
|
||||||
|
(write_menu_entry_html):
|
||||||
|
* components/help/converters/gnome-man2html2/gnome-man2html.c:
|
||||||
|
(add_links), (scan_escape), (scan_format), (scan_table),
|
||||||
|
(scan_expression), (scan_request), (scan_troff),
|
||||||
|
(scan_troff_mandoc), (main):
|
||||||
|
* src/nautilus-first-time-druid.c: (load_netscape_proxy_settings):
|
||||||
|
* src/nautilus-property-browser.c: (emblem_keyword_valid):
|
||||||
|
Fix code that was using <ctype.h> functions and passing char's
|
||||||
|
rather than int's (using the standard "cast to unsigned char"
|
||||||
|
trick).
|
||||||
|
|
||||||
|
* libnautilus-private/nautilus-file.c:
|
||||||
|
(nautilus_file_denies_access_permission),
|
||||||
|
(nautilus_file_can_set_permissions), (nautilus_file_set_owner),
|
||||||
|
(nautilus_file_get_group_name), (nautilus_file_can_set_group),
|
||||||
|
(nautilus_file_get_settable_group_names),
|
||||||
|
(nautilus_file_set_group):
|
||||||
|
Get rid of the assumption that GnomeVFSFileInfo field types match
|
||||||
|
the platform-specific uid_t and gid_t. This involves doing a few
|
||||||
|
more type casts.
|
||||||
|
(nautilus_extract_top_left_text): Fix a use of isprint on a char
|
||||||
|
rather than an int.
|
||||||
|
|
||||||
|
* libnautilus-private/nautilus-volume-monitor.c: Added ifdefs so
|
||||||
|
this file can compile for Solaris without warnings.
|
||||||
|
|
||||||
|
* test/test.c: (test_window_set_title_with_pid): Don't assume that
|
||||||
|
getpid() returns an int. Instead cast it to unsigned long for
|
||||||
|
printing.
|
||||||
|
|
||||||
2001-07-11 Alex Larsson <alexl@redhat.com>
|
2001-07-11 Alex Larsson <alexl@redhat.com>
|
||||||
|
|
||||||
* acconfig.h:
|
* acconfig.h:
|
||||||
|
|
|
@ -861,7 +861,7 @@ void write_menu_entry_html( FILE *f, char *p, char *nodefile, char **menu_end )
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i=1; i<4; i++)
|
for (i=1; i<4; i++)
|
||||||
if (!isspace(*(realend+i)) && *(realend+i) != '\n')
|
if (!isspace((guchar)*(realend+i)) && *(realend+i) != '\n')
|
||||||
{
|
{
|
||||||
done = 1;
|
done = 1;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -539,9 +539,9 @@ add_links(char *c)
|
||||||
f=idtest[j];
|
f=idtest[j];
|
||||||
/* check section */
|
/* check section */
|
||||||
g=strchr(f,')');
|
g=strchr(f,')');
|
||||||
if (g && f-g<6 && (isalnum(f[-1]) || f[-1]=='>') &&
|
if (g && f-g<6 && (isalnum((unsigned char)f[-1]) || f[-1]=='>') &&
|
||||||
((isdigit(f[1]) && f[1]!='0' &&
|
((isdigit((unsigned char)f[1]) && f[1]!='0' &&
|
||||||
(f[2]==')' || (isalpha(f[2]) && f[3]==')') ||
|
(f[2]==')' || (isalpha((unsigned char)f[2]) && f[3]==')') ||
|
||||||
f[2]=='X')) ||
|
f[2]=='X')) ||
|
||||||
(f[2]==')' && (f[1]=='n' || f[1]=='l')))) {
|
(f[2]==')' && (f[1]=='n' || f[1]=='l')))) {
|
||||||
/* this might be a link */
|
/* this might be a link */
|
||||||
|
@ -551,14 +551,14 @@ add_links(char *c)
|
||||||
while (h!=c && *h!='<') h--;
|
while (h!=c && *h!='<') h--;
|
||||||
if (h!=c) h--;
|
if (h!=c) h--;
|
||||||
}
|
}
|
||||||
if (isalnum(*h)) {
|
if (isalnum((unsigned char)*h)) {
|
||||||
char t,sec,subsec, *e;
|
char t,sec,subsec, *e;
|
||||||
e=h+1;
|
e=h+1;
|
||||||
sec=f[1];
|
sec=f[1];
|
||||||
subsec=f[2];
|
subsec=f[2];
|
||||||
if ((subsec=='X' && f[3]!=')') ||
|
if ((subsec=='X' && f[3]!=')') ||
|
||||||
subsec==')') subsec='\0';
|
subsec==')') subsec='\0';
|
||||||
while (h>c && (isalnum(h[-1]) ||
|
while (h>c && (isalnum((unsigned char)h[-1]) ||
|
||||||
h[-1]=='_' ||
|
h[-1]=='_' ||
|
||||||
h[-1]=='-' ||
|
h[-1]=='-' ||
|
||||||
h[-1]=='.'))
|
h[-1]=='.'))
|
||||||
|
@ -605,7 +605,7 @@ add_links(char *c)
|
||||||
case 3: /* ftp */
|
case 3: /* ftp */
|
||||||
case 2: /* www */
|
case 2: /* www */
|
||||||
g=f=idtest[j];
|
g=f=idtest[j];
|
||||||
while (*g && (isalnum(*g) || *g=='_' || *g=='-'
|
while (*g && (isalnum((unsigned char)*g) || *g=='_' || *g=='-'
|
||||||
|| *g=='+' ||
|
|| *g=='+' ||
|
||||||
*g=='.')) g++;
|
*g=='.')) g++;
|
||||||
if (g[-1]=='.') g--;
|
if (g[-1]=='.') g--;
|
||||||
|
@ -628,12 +628,12 @@ add_links(char *c)
|
||||||
break;
|
break;
|
||||||
case 1: /* mailto */
|
case 1: /* mailto */
|
||||||
g=f=idtest[1];
|
g=f=idtest[1];
|
||||||
while (g>c && (isalnum(g[-1]) || g[-1]=='_'
|
while (g>c && (isalnum((unsigned char)g[-1]) || g[-1]=='_'
|
||||||
|| g[-1]=='-' ||
|
|| g[-1]=='-' ||
|
||||||
g[-1]=='+' || g[-1]=='.'
|
g[-1]=='+' || g[-1]=='.'
|
||||||
|| g[-1]=='%')) g--;
|
|| g[-1]=='%')) g--;
|
||||||
h=f+1;
|
h=f+1;
|
||||||
while (*h && (isalnum(*h) || *h=='_' || *h=='-'
|
while (*h && (isalnum((unsigned char)*h) || *h=='_' || *h=='-'
|
||||||
|| *h=='+' ||
|
|| *h=='+' ||
|
||||||
*h=='.')) h++;
|
*h=='.')) h++;
|
||||||
if (*h=='.') h--;
|
if (*h=='.') h--;
|
||||||
|
@ -656,9 +656,9 @@ add_links(char *c)
|
||||||
break;
|
break;
|
||||||
case 0: /* url */
|
case 0: /* url */
|
||||||
g=f=idtest[0];
|
g=f=idtest[0];
|
||||||
while (g>c && isalpha(g[-1]) && islower(g[-1])) g--;
|
while (g>c && isalpha((unsigned char)g[-1]) && islower((unsigned char)g[-1])) g--;
|
||||||
h=f+3;
|
h=f+3;
|
||||||
while (*h && !isspace(*h) && *h!='<' && *h!='>'
|
while (*h && !isspace((unsigned char)*h) && *h!='<' && *h!='>'
|
||||||
&& *h!='"' &&
|
&& *h!='"' &&
|
||||||
*h!='&') h++;
|
*h!='&') h++;
|
||||||
if (f-g>2 && f-g<7 && h-f>3) {
|
if (f-g>2 && f-g<7 && h-f>3) {
|
||||||
|
@ -890,7 +890,7 @@ static char
|
||||||
c=scan_escape(c);
|
c=scan_escape(c);
|
||||||
i=intresult; if (!j) j=1;
|
i=intresult; if (!j) j=1;
|
||||||
} else
|
} else
|
||||||
while (isdigit(*c) && (!i || (!j && i<4)))
|
while (isdigit((unsigned char)*c) && (!i || (!j && i<4)))
|
||||||
i=i*10+(*c++)-'0';
|
i=i*10+(*c++)-'0';
|
||||||
if (!j) { j=1; if (i) i=i-10; }
|
if (!j) { j=1; if (i) i=i-10; }
|
||||||
if (!skip_escape)
|
if (!skip_escape)
|
||||||
|
@ -1070,7 +1070,7 @@ static char
|
||||||
c++;
|
c++;
|
||||||
curfield->font = toupper(*c);
|
curfield->font = toupper(*c);
|
||||||
c++;
|
c++;
|
||||||
if (!isspace(*c) && *c!='.') c++;
|
if (!isspace((unsigned char)*c) && *c!='.') c++;
|
||||||
break;
|
break;
|
||||||
case 't': case 'T': curfield->valign='t'; c++; break;
|
case 't': case 'T': curfield->valign='t'; c++; break;
|
||||||
case 'p': case 'P':
|
case 'p': case 'P':
|
||||||
|
@ -1078,7 +1078,7 @@ static char
|
||||||
i=j=0;
|
i=j=0;
|
||||||
if (*c=='+') { j=1; c++; }
|
if (*c=='+') { j=1; c++; }
|
||||||
if (*c=='-') { j=-1; c++; }
|
if (*c=='-') { j=-1; c++; }
|
||||||
while (isdigit(*c)) i=i*10+(*c++)-'0';
|
while (isdigit((unsigned char)*c)) i=i*10+(*c++)-'0';
|
||||||
if (j) curfield->size= i*j; else curfield->size=j-10;
|
if (j) curfield->size= i*j; else curfield->size=j-10;
|
||||||
break;
|
break;
|
||||||
case 'v': case 'V':
|
case 'v': case 'V':
|
||||||
|
@ -1096,7 +1096,7 @@ static char
|
||||||
case '0': case '1': case '2': case '3': case '4':
|
case '0': case '1': case '2': case '3': case '4':
|
||||||
case '5': case '6': case '7': case '8': case '9':
|
case '5': case '6': case '7': case '8': case '9':
|
||||||
i=0;
|
i=0;
|
||||||
while (isdigit(*c)) i=i*10+(*c++)-'0';
|
while (isdigit((unsigned char)*c)) i=i*10+(*c++)-'0';
|
||||||
curfield->space=i;
|
curfield->space=i;
|
||||||
break;
|
break;
|
||||||
case ',': case '\n':
|
case ',': case '\n':
|
||||||
|
@ -1188,7 +1188,7 @@ static char
|
||||||
if (h[-1]==';') {
|
if (h[-1]==';') {
|
||||||
/* scan table options */
|
/* scan table options */
|
||||||
while (c<h) {
|
while (c<h) {
|
||||||
while (isspace(*c)) c++;
|
while (isspace((unsigned char)*c)) c++;
|
||||||
for (i=0; tableopt[i] &&
|
for (i=0; tableopt[i] &&
|
||||||
strncmp(tableopt[i],c,tableoptl[i]);i++);
|
strncmp(tableopt[i],c,tableoptl[i]);i++);
|
||||||
c=c+tableoptl[i];
|
c=c+tableoptl[i];
|
||||||
|
@ -1215,7 +1215,7 @@ static char
|
||||||
case 6:
|
case 6:
|
||||||
while (*c++!='(');
|
while (*c++!='(');
|
||||||
linesize=0;
|
linesize=0;
|
||||||
while (isdigit(*c))
|
while (isdigit((unsigned char)*c))
|
||||||
linesize=linesize*10+(*c++)-'0';
|
linesize=linesize*10+(*c++)-'0';
|
||||||
break;
|
break;
|
||||||
case 7:
|
case 7:
|
||||||
|
@ -1312,7 +1312,7 @@ static char
|
||||||
currow->prev->next=NULL;
|
currow->prev->next=NULL;
|
||||||
currow->prev=NULL;
|
currow->prev=NULL;
|
||||||
clear_table(currow);
|
clear_table(currow);
|
||||||
} else if (*c=='.' && c[-1]=='\n' && !isdigit(c[1])) {
|
} else if (*c=='.' && c[-1]=='\n' && !isdigit((unsigned char)c[1])) {
|
||||||
/* skip troff request inside table(usually only .sp )*/
|
/* skip troff request inside table(usually only .sp )*/
|
||||||
while (*c++!='\n');
|
while (*c++!='\n');
|
||||||
} else {
|
} else {
|
||||||
|
@ -1542,7 +1542,7 @@ static char
|
||||||
c=c+3;
|
c=c+3;
|
||||||
c++;
|
c++;
|
||||||
} else {
|
} else {
|
||||||
while (*c && !isspace(*c) && *c!=')') {
|
while (*c && !isspace((unsigned char)*c) && *c!=')') {
|
||||||
opex=0;
|
opex=0;
|
||||||
switch (*c) {
|
switch (*c) {
|
||||||
case '(':
|
case '(':
|
||||||
|
@ -1558,16 +1558,16 @@ static char
|
||||||
case '8': case '9': {
|
case '8': case '9': {
|
||||||
int num=0,denum=1;
|
int num=0,denum=1;
|
||||||
value2=0;
|
value2=0;
|
||||||
while (isdigit(*c))
|
while (isdigit((unsigned char)*c))
|
||||||
value2=value2*10+((*c++)-'0');
|
value2=value2*10+((*c++)-'0');
|
||||||
if (*c=='.') {
|
if (*c=='.') {
|
||||||
c++;
|
c++;
|
||||||
while (isdigit(*c)) {
|
while (isdigit((unsigned char)*c)) {
|
||||||
num=num*10+((*c++)-'0');
|
num=num*10+((*c++)-'0');
|
||||||
denum=denum*10;
|
denum=denum*10;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isalpha(*c)) {
|
if (isalpha((unsigned char)*c)) {
|
||||||
/* scale indicator */
|
/* scale indicator */
|
||||||
switch (*c) {
|
switch (*c) {
|
||||||
case 'i': /* inch -> 10pt */
|
case 'i': /* inch -> 10pt */
|
||||||
|
@ -1588,7 +1588,7 @@ static char
|
||||||
case '\\':
|
case '\\':
|
||||||
c=scan_escape(c+1);
|
c=scan_escape(c+1);
|
||||||
value2=intresult*sign;
|
value2=intresult*sign;
|
||||||
if (isalpha(*c))
|
if (isalpha((unsigned char)*c))
|
||||||
c++; /* scale indicator */
|
c++; /* scale indicator */
|
||||||
opex=1;
|
opex=1;
|
||||||
break;
|
break;
|
||||||
|
@ -2026,7 +2026,7 @@ static char
|
||||||
c=c+1;
|
c=c+1;
|
||||||
else
|
else
|
||||||
c=c+2;
|
c=c+2;
|
||||||
while (isspace(*c))
|
while (isspace((unsigned char)*c))
|
||||||
c++;
|
c++;
|
||||||
if (*c=='"')
|
if (*c=='"')
|
||||||
c++;
|
c++;
|
||||||
|
@ -2646,7 +2646,7 @@ static char
|
||||||
c=c+j;
|
c=c+j;
|
||||||
i=V(c[0],c[1]);
|
i=V(c[0],c[1]);
|
||||||
c=c+2;
|
c=c+2;
|
||||||
while (isspace(*c) && *c!='\n')
|
while (isspace((unsigned char)*c) && *c!='\n')
|
||||||
c++;
|
c++;
|
||||||
j=V(c[0],c[1]);
|
j=V(c[0],c[1]);
|
||||||
while (*c && *c!='\n')
|
while (*c && *c!='\n')
|
||||||
|
@ -2826,7 +2826,7 @@ static char
|
||||||
break;
|
break;
|
||||||
case V('I','t'): /* BSD mandoc */
|
case V('I','t'): /* BSD mandoc */
|
||||||
c=c+j;
|
c=c+j;
|
||||||
if (strncmp(c, "Xo", 2) == 0 && isspace(*(c+2))) {
|
if (strncmp(c, "Xo", 2) == 0 && isspace((unsigned char)*(c+2))) {
|
||||||
c = skip_till_newline(c);
|
c = skip_till_newline(c);
|
||||||
}
|
}
|
||||||
if (dl_set[itemdepth] & BL_DESC_LIST) {
|
if (dl_set[itemdepth] & BL_DESC_LIST) {
|
||||||
|
@ -2977,23 +2977,23 @@ static char
|
||||||
c = c+j;
|
c = c+j;
|
||||||
if (*c == '\n')
|
if (*c == '\n')
|
||||||
c++; /* Skip spaces */
|
c++; /* Skip spaces */
|
||||||
while (isspace(*c) && *c != '\n')
|
while (isspace((unsigned char)*c) && *c != '\n')
|
||||||
c++;
|
c++;
|
||||||
while (isalnum(*c)) { /* Copy the xyz part */
|
while (isalnum((unsigned char)*c)) { /* Copy the xyz part */
|
||||||
*bufptr = *c;
|
*bufptr = *c;
|
||||||
bufptr++;
|
bufptr++;
|
||||||
if (bufptr >= buff + MED_STR_MAX)
|
if (bufptr >= buff + MED_STR_MAX)
|
||||||
break;
|
break;
|
||||||
c++;
|
c++;
|
||||||
}
|
}
|
||||||
while (isspace(*c) && *c != '\n')
|
while (isspace((unsigned char)*c) && *c != '\n')
|
||||||
c++; /* Skip spaces */
|
c++; /* Skip spaces */
|
||||||
/* Convert the number if there is one */
|
/* Convert the number if there is one */
|
||||||
if (isdigit(*c)) {
|
if (isdigit((unsigned char)*c)) {
|
||||||
*bufptr = '(';
|
*bufptr = '(';
|
||||||
bufptr++;
|
bufptr++;
|
||||||
if (bufptr < buff + MED_STR_MAX) {
|
if (bufptr < buff + MED_STR_MAX) {
|
||||||
while (isalnum(*c)) {
|
while (isalnum((unsigned char)*c)) {
|
||||||
*bufptr = *c;
|
*bufptr = *c;
|
||||||
bufptr++;
|
bufptr++;
|
||||||
if (bufptr >= buff +
|
if (bufptr >= buff +
|
||||||
|
@ -3009,7 +3009,7 @@ static char
|
||||||
}
|
}
|
||||||
|
|
||||||
while (*c != '\n') { /* Copy the remainder */
|
while (*c != '\n') { /* Copy the remainder */
|
||||||
if (!isspace(*c)) {
|
if (!isspace((unsigned char)*c)) {
|
||||||
*bufptr = *c;
|
*bufptr = *c;
|
||||||
bufptr++;
|
bufptr++;
|
||||||
if (bufptr >= buff + MED_STR_MAX)
|
if (bufptr >= buff + MED_STR_MAX)
|
||||||
|
@ -3145,11 +3145,11 @@ static char
|
||||||
do { /* Find first whitespace after the
|
do { /* Find first whitespace after the
|
||||||
* first word that isn't a mandoc macro
|
* first word that isn't a mandoc macro
|
||||||
*/
|
*/
|
||||||
while (*sp && isspace(*sp))
|
while (*sp && isspace((unsigned char)*sp))
|
||||||
sp++;
|
sp++;
|
||||||
while (*sp && !isspace(*sp))
|
while (*sp && !isspace((unsigned char)*sp))
|
||||||
sp++;
|
sp++;
|
||||||
} while (*sp && isupper(*(sp-2)) && islower(*(sp-1)));
|
} while (*sp && isupper((unsigned char)*(sp-2)) && islower((unsigned char)*(sp-1)));
|
||||||
|
|
||||||
/* Use a newline to mark the end of text to
|
/* Use a newline to mark the end of text to
|
||||||
* be quoted
|
* be quoted
|
||||||
|
@ -3399,8 +3399,8 @@ static char
|
||||||
*sl='\n';
|
*sl='\n';
|
||||||
}
|
}
|
||||||
else if (mandoc_command &&
|
else if (mandoc_command &&
|
||||||
((isupper(*c) && islower(*(c+1)))
|
((isupper((unsigned char)*c) && islower((unsigned char)*(c+1)))
|
||||||
|| (islower(*c) && isupper(*(c+1))))
|
|| (islower((unsigned char)*c) && isupper((unsigned char)*(c+1))))
|
||||||
) {
|
) {
|
||||||
/* Let through any BSD mandoc commands
|
/* Let through any BSD mandoc commands
|
||||||
* that haven't
|
* that haven't
|
||||||
|
@ -3490,9 +3490,9 @@ static char
|
||||||
if (san && h[-1]=='\n')
|
if (san && h[-1]=='\n')
|
||||||
h--;
|
h--;
|
||||||
} else if (mandoc_line
|
} else if (mandoc_line
|
||||||
&& *(h) && isupper(*(h))
|
&& *(h) && isupper((unsigned char)*(h))
|
||||||
&& *(h+1) && islower(*(h+1))
|
&& *(h+1) && islower((unsigned char)*(h+1))
|
||||||
&& *(h+2) && isspace(*(h+2))) {
|
&& *(h+2) && isspace((unsigned char)*(h+2))) {
|
||||||
/* BSD imbedded command
|
/* BSD imbedded command
|
||||||
eg ".It Fl Ar arg1 Fl Ar arg2" */
|
eg ".It Fl Ar arg1 Fl Ar arg2" */
|
||||||
FLUSHIBP;
|
FLUSHIBP;
|
||||||
|
@ -3506,7 +3506,7 @@ static char
|
||||||
if (san && h[-1]=='\n')
|
if (san && h[-1]=='\n')
|
||||||
h--;
|
h--;
|
||||||
} else {
|
} else {
|
||||||
if (h[-1]=='\n' && still_dd && isalnum(*h)) {
|
if (h[-1]=='\n' && still_dd && isalnum((unsigned char)*h)) {
|
||||||
/* sometimes a .HP request is not
|
/* sometimes a .HP request is not
|
||||||
followed by a .br request */
|
followed by a .br request */
|
||||||
FLUSHIBP;
|
FLUSHIBP;
|
||||||
|
@ -3651,8 +3651,8 @@ static char
|
||||||
}
|
}
|
||||||
|
|
||||||
if (end > c + 2
|
if (end > c + 2
|
||||||
&& ispunct(*(end - 1))
|
&& ispunct((unsigned char)*(end - 1))
|
||||||
&& isspace(*(end - 2)) && *(end - 2) != '\n') {
|
&& isspace((unsigned char)*(end - 2)) && *(end - 2) != '\n') {
|
||||||
/* Don't format lonely punctuation E.g. in "xyz ," format
|
/* Don't format lonely punctuation E.g. in "xyz ," format
|
||||||
* the xyz and then append the comma removing the space.
|
* the xyz and then append the comma removing the space.
|
||||||
*/
|
*/
|
||||||
|
@ -3716,7 +3716,7 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
/* Try searching for this as a man page name, instead */
|
/* Try searching for this as a man page name, instead */
|
||||||
ctmp = strrchr(infile, '.');
|
ctmp = strrchr(infile, '.');
|
||||||
if(ctmp && (isdigit(*(ctmp+1)) || (*(ctmp+1) == 'n')) && *(ctmp+2) == '\0')
|
if(ctmp && (isdigit((unsigned char)*(ctmp+1)) || (*(ctmp+1) == 'n')) && *(ctmp+2) == '\0')
|
||||||
{
|
{
|
||||||
char section = *(ctmp+1);
|
char section = *(ctmp+1);
|
||||||
|
|
||||||
|
@ -3732,7 +3732,7 @@ main(int argc, char **argv)
|
||||||
pclose(fh);
|
pclose(fh);
|
||||||
|
|
||||||
i = strlen(output) - 1;
|
i = strlen(output) - 1;
|
||||||
while(isspace(output[i])) output[i--] = '\0';
|
while(isspace((unsigned char)output[i])) output[i--] = '\0';
|
||||||
|
|
||||||
if (output[0]) {
|
if (output[0]) {
|
||||||
#ifdef HAVE_LIBBZ2
|
#ifdef HAVE_LIBBZ2
|
||||||
|
@ -3745,16 +3745,17 @@ main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef HAVE_LIBBZ2
|
#ifdef HAVE_LIBBZ2
|
||||||
if(!infh && !inbfh) {
|
if(!infh && !inbfh)
|
||||||
#else
|
#else
|
||||||
if(!infh) {
|
if(!infh)
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
printf("<HTML><HEAD><TITLE>Document not found</TITLE>\n"
|
printf("<HTML><HEAD><TITLE>Document not found</TITLE>\n"
|
||||||
"</HEAD><BODY>The document \"%s\" couldn't be found. It may have been removed from your system.\n"
|
"</HEAD><BODY>The document \"%s\" couldn't be found. It may have been removed from your system.\n"
|
||||||
"</BODY></HTML>\n", infile);
|
"</BODY></HTML>\n", infile);
|
||||||
|
|
||||||
return 3;
|
return 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
buf=read_man_page();
|
buf=read_man_page();
|
||||||
if (!buf) {
|
if (!buf) {
|
||||||
|
|
|
@ -614,7 +614,7 @@ nautilus_file_denies_access_permission (NautilusFile *file,
|
||||||
* Can we trust the uid in the file info? Might
|
* Can we trust the uid in the file info? Might
|
||||||
* there be garbage there? What will it do for non-local files?
|
* there be garbage there? What will it do for non-local files?
|
||||||
*/
|
*/
|
||||||
if (user_id == file->details->info->uid) {
|
if (user_id == (uid_t) file->details->info->uid) {
|
||||||
return (file->details->info->permissions & owner_permission) == 0;
|
return (file->details->info->permissions & owner_permission) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -627,13 +627,13 @@ nautilus_file_denies_access_permission (NautilusFile *file,
|
||||||
* there be garbage there? What will it do for non-local files?
|
* there be garbage there? What will it do for non-local files?
|
||||||
*/
|
*/
|
||||||
if (password_info != NULL
|
if (password_info != NULL
|
||||||
&& password_info->pw_gid == file->details->info->gid) {
|
&& password_info->pw_gid == (gid_t) file->details->info->gid) {
|
||||||
return (file->details->info->permissions & group_permission) == 0;
|
return (file->details->info->permissions & group_permission) == 0;
|
||||||
}
|
}
|
||||||
/* Check supplementary groups */
|
/* Check supplementary groups */
|
||||||
num_supplementary_groups = getgroups (NGROUPS_MAX, supplementary_groups);
|
num_supplementary_groups = getgroups (NGROUPS_MAX, supplementary_groups);
|
||||||
for (i = 0; i < num_supplementary_groups; i++) {
|
for (i = 0; i < num_supplementary_groups; i++) {
|
||||||
if (file->details->info->gid == supplementary_groups[i]) {
|
if ((gid_t) file->details->info->gid == supplementary_groups[i]) {
|
||||||
return (file->details->info->permissions & group_permission) == 0;
|
return (file->details->info->permissions & group_permission) == 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2889,7 +2889,7 @@ nautilus_file_can_set_permissions (NautilusFile *file)
|
||||||
user_id = geteuid();
|
user_id = geteuid();
|
||||||
|
|
||||||
/* Owner is allowed to set permissions. */
|
/* Owner is allowed to set permissions. */
|
||||||
if (user_id == file->details->info->uid) {
|
if (user_id == (uid_t) file->details->info->uid) {
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3292,7 +3292,7 @@ nautilus_file_set_owner (NautilusFile *file,
|
||||||
* don't want to send the file-changed signal if nothing
|
* don't want to send the file-changed signal if nothing
|
||||||
* changed.
|
* changed.
|
||||||
*/
|
*/
|
||||||
if (new_id == file->details->info->uid) {
|
if (new_id == (uid_t) file->details->info->uid) {
|
||||||
(* callback) (file, GNOME_VFS_OK, callback_data);
|
(* callback) (file, GNOME_VFS_OK, callback_data);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -3390,7 +3390,7 @@ nautilus_file_get_group_name (NautilusFile *file)
|
||||||
* there be garbage there? What will it do for non-local files?
|
* there be garbage there? What will it do for non-local files?
|
||||||
*/
|
*/
|
||||||
/* No need to free result of getgrgid */
|
/* No need to free result of getgrgid */
|
||||||
group_info = getgrgid (file->details->info->gid);
|
group_info = getgrgid ((gid_t) file->details->info->gid);
|
||||||
|
|
||||||
if (group_info != NULL) {
|
if (group_info != NULL) {
|
||||||
return g_strdup (group_info->gr_name);
|
return g_strdup (group_info->gr_name);
|
||||||
|
@ -3431,7 +3431,7 @@ nautilus_file_can_set_group (NautilusFile *file)
|
||||||
user_id = geteuid();
|
user_id = geteuid();
|
||||||
|
|
||||||
/* Owner is allowed to set group (with restrictions). */
|
/* Owner is allowed to set group (with restrictions). */
|
||||||
if (user_id == file->details->info->uid) {
|
if (user_id == (uid_t) file->details->info->uid) {
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3534,7 +3534,7 @@ nautilus_file_get_settable_group_names (NautilusFile *file)
|
||||||
if (user_id == 0) {
|
if (user_id == 0) {
|
||||||
/* Root is allowed to set group to anything. */
|
/* Root is allowed to set group to anything. */
|
||||||
result = nautilus_get_group_names_including (NULL);
|
result = nautilus_get_group_names_including (NULL);
|
||||||
} else if (user_id == file->details->info->uid) {
|
} else if (user_id == (uid_t) file->details->info->uid) {
|
||||||
/* Owner is allowed to set group to any that owner is member of. */
|
/* Owner is allowed to set group to any that owner is member of. */
|
||||||
user_name_string = get_user_name_from_id (user_id);
|
user_name_string = get_user_name_from_id (user_id);
|
||||||
result = nautilus_get_group_names_including (user_name_string);
|
result = nautilus_get_group_names_including (user_name_string);
|
||||||
|
@ -3595,7 +3595,7 @@ nautilus_file_set_group (NautilusFile *file,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_id == file->details->info->gid) {
|
if (new_id == (gid_t) file->details->info->gid) {
|
||||||
(* callback) (file, GNOME_VFS_OK, callback_data);
|
(* callback) (file, GNOME_VFS_OK, callback_data);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -5056,7 +5056,7 @@ nautilus_extract_top_left_text (const char *text,
|
||||||
if (*in == '\n') {
|
if (*in == '\n') {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (isprint (*in)) {
|
if (isprint ((guchar) *in)) {
|
||||||
*out++ = *in;
|
*out++ = *in;
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -462,6 +462,7 @@ get_removable_volumes (void)
|
||||||
return g_list_sort (g_list_reverse (volumes), (GCompareFunc) floppy_sort);
|
return g_list_sort (g_list_reverse (volumes), (GCompareFunc) floppy_sort);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef SOLARIS_MNT
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
volume_is_removable (const NautilusVolume *volume)
|
volume_is_removable (const NautilusVolume *volume)
|
||||||
|
@ -554,6 +555,7 @@ volume_is_read_only (const NautilusVolume *volume)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* !SOLARIS_MNT */
|
||||||
|
|
||||||
char *
|
char *
|
||||||
nautilus_volume_monitor_get_volume_name (const NautilusVolume *volume)
|
nautilus_volume_monitor_get_volume_name (const NautilusVolume *volume)
|
||||||
|
|
|
@ -1459,7 +1459,7 @@ load_netscape_proxy_settings (void)
|
||||||
} else if ( NULL != (current = strstr (line, "\"network.proxy.http_port\""))) {
|
} else if ( NULL != (current = strstr (line, "\"network.proxy.http_port\""))) {
|
||||||
current += strlen ("\"network.proxy.http_port\"");
|
current += strlen ("\"network.proxy.http_port\"");
|
||||||
|
|
||||||
while ( *current && !isdigit(*current)) {
|
while (*current && !isdigit ((guchar) *current)) {
|
||||||
current++;
|
current++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1473,7 +1473,7 @@ load_netscape_proxy_settings (void)
|
||||||
/* Proxy type must equal '1' */
|
/* Proxy type must equal '1' */
|
||||||
current += strlen ("\"network.proxy.type\"");
|
current += strlen ("\"network.proxy.type\"");
|
||||||
|
|
||||||
while ( *current && !isdigit(*current)) {
|
while (*current && !isdigit ((guchar) *current)) {
|
||||||
current++;
|
current++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1252,7 +1252,8 @@ emblem_keyword_valid (const char *keyword)
|
||||||
|
|
||||||
keyword_length = strlen (keyword);
|
keyword_length = strlen (keyword);
|
||||||
for (index = 0; index < keyword_length; index++) {
|
for (index = 0; index < keyword_length; index++) {
|
||||||
if (!isalnum (keyword[index]) && !isspace (keyword[index])) {
|
if (!isalnum ((guchar) keyword[index])
|
||||||
|
&& !isspace ((guchar) keyword[index])) {
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -311,7 +311,7 @@ test_window_set_title_with_pid (GtkWindow *window,
|
||||||
|
|
||||||
g_return_if_fail (GTK_IS_WINDOW (window));
|
g_return_if_fail (GTK_IS_WINDOW (window));
|
||||||
|
|
||||||
tmp = g_strdup_printf ("%d: %s", getpid (), title);
|
tmp = g_strdup_printf ("%lu: %s", (gulong) getpid (), title);
|
||||||
gtk_window_set_title (GTK_WINDOW (window), tmp);
|
gtk_window_set_title (GTK_WINDOW (window), tmp);
|
||||||
g_free (tmp);
|
g_free (tmp);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue