Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

cosmetic fixes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-02-06 21:11:49 +01:00
parent 6aca76d4d7
commit 0cd445f4d1
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
coreutils/chown.c
View File

@ -62,8 +62,8 @@ static int FAST_FUNC fileAction(const char *fileName, struct stat *statbuf,
{ {
#define param (*(struct param_t*)vparam) #define param (*(struct param_t*)vparam)
#define opt option_mask32 #define opt option_mask32
uid_t u = (param.ugid.uid == (uid_t)-1) ? statbuf->st_uid : param.ugid.uid; uid_t u = (param.ugid.uid == (uid_t)-1L) ? statbuf->st_uid : param.ugid.uid;
gid_t g = (param.ugid.gid == (gid_t)-1) ? statbuf->st_gid : param.ugid.gid; gid_t g = (param.ugid.gid == (gid_t)-1L) ? statbuf->st_gid : param.ugid.gid;
if (param.chown_func(fileName, u, g) == 0) { if (param.chown_func(fileName, u, g) == 0) {
if (OPT_VERBOSE if (OPT_VERBOSE
@ -75,7 +75,7 @@ static int FAST_FUNC fileAction(const char *fileName, struct stat *statbuf,
return TRUE; return TRUE;
} }
if (!OPT_QUIET) if (!OPT_QUIET)
bb_simple_perror_msg(fileName); /* A filename can have % in it... */ bb_simple_perror_msg(fileName);
return FALSE; return FALSE;
#undef opt #undef opt
#undef param #undef param
@ -87,8 +87,9 @@ int chown_main(int argc UNUSED_PARAM, char **argv)
int opt, flags; int opt, flags;
struct param_t param; struct param_t param;
param.ugid.uid = -1; /* Just -1 might not work: uid_t may be unsigned long */
param.ugid.gid = -1; param.ugid.uid = -1L;
param.ugid.gid = -1L;
#if ENABLE_FEATURE_CHOWN_LONG_OPTIONS #if ENABLE_FEATURE_CHOWN_LONG_OPTIONS
applet_long_options = chown_longopts; applet_long_options = chown_longopts;

4
libbb/copy_file.c
View File

@ -316,9 +316,9 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
#endif #endif
if (bb_copyfd_eof(src_fd, dst_fd) == -1) if (bb_copyfd_eof(src_fd, dst_fd) == -1)
retval = -1; retval = -1;
/* Ok, writing side I can understand... */ /* Careful with writing... */
if (close(dst_fd) < 0) { if (close(dst_fd) < 0) {
bb_perror_msg("can't close '%s'", dest); bb_perror_msg("error writing to '%s'", dest);
retval = -1; retval = -1;
} }
/* ...but read size is already checked by bb_copyfd_eof */ /* ...but read size is already checked by bb_copyfd_eof */