Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-25 18:33:06 +00:00
Code Issues Projects Releases Wiki Activity

Make some 64 bit warnings go away on x86-64.

Browse Source
This commit is contained in:
Rob Landley 2006-06-19 03:20:03 +00:00
parent 290fcb4213
commit 7a260f01ce
6 changed files with 26 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
coreutils/who.c
View File

@ -14,12 +14,9 @@
*---------------------------------------------------------------------- *----------------------------------------------------------------------
*/ */
#include <stdio.h>
#include <stdlib.h>
#include <utmp.h>
#include <sys/stat.h>
#include <time.h>
#include "busybox.h" #include "busybox.h"
#include <utmp.h>
#include <time.h>
static const char * idle_string (time_t t) static const char * idle_string (time_t t)
{ {
@ -33,7 +30,7 @@ static const char * idle_string (time_t t)
sprintf (str, "%02d:%02d", sprintf (str, "%02d:%02d",
(int) (s / (60 * 60)), (int) (s / (60 * 60)),
(int) ((s % (60 * 60)) / 60)); (int) ((s % (60 * 60)) / 60));
return (const char *) str; return str;
} }
return "old"; return "old";
} }
@ -52,14 +49,16 @@ int who_main(int argc, char **argv)
printf("USER TTY IDLE TIME HOST\n"); printf("USER TTY IDLE TIME HOST\n");
while ((ut = getutent()) != NULL) { while ((ut = getutent()) != NULL) {
if (ut->ut_user[0] && ut->ut_type == USER_PROCESS) { if (ut->ut_user[0] && ut->ut_type == USER_PROCESS) {
time_t thyme = ut->ut_tv.tv_sec;
/* ut->ut_line is device name of tty - "/dev/" */ /* ut->ut_line is device name of tty - "/dev/" */
name = concat_path_file("/dev", ut->ut_line); name = concat_path_file("/dev", ut->ut_line);
printf("%-10s %-8s %-8s %-12.12s %s\n", ut->ut_user, ut->ut_line, printf("%-10s %-8s %-8s %-12.12s %s\n", ut->ut_user, ut->ut_line,
(stat(name, &st)) ? "?" : idle_string(st.st_atime), (stat(name, &st)) ? "?" : idle_string(st.st_atime),
ctime((time_t*)&(ut->ut_tv.tv_sec)) + 4, ut->ut_host); ctime(&thyme) + 4, ut->ut_host);
free(name); if (ENABLE_FEATURE_CLEAN_UP) free(name);
} }
} }
endutent(); if (ENABLE_FEATURE_CLEAN_UP) endutent();
return 0; return 0;
} }

41
e2fsprogs/e2fsck.c
View File

@ -3,9 +3,6 @@
* *
* Copyright (C) 1993, 1994, 1995, 1996, 1997 Theodore Ts'o. * Copyright (C) 1993, 1994, 1995, 1996, 1997 Theodore Ts'o.
* Copyright (C) 2006 Garrett Kajmowicz * Copyright (C) 2006 Garrett Kajmowicz
* This file may be
* redistributed under the terms of the GNU Public License.
*
* *
* Dictionary Abstract Data Type * Dictionary Abstract Data Type
* Copyright (C) 1997 Kaz Kylheku <kaz@ashi.footprints.net> * Copyright (C) 1997 Kaz Kylheku <kaz@ashi.footprints.net>
@ -25,12 +22,10 @@
* *
* Copyright 1999-2000 Red Hat Software --- All Rights Reserved * Copyright 1999-2000 Red Hat Software --- All Rights Reserved
* *
* This file is part of the Linux kernel and is made available under
* the terms of the GNU General Public License, version 2, or at your
* option, any later version, incorporated herein by reference.
*
* Journal recovery routines for the generic filesystem journaling code; * Journal recovery routines for the generic filesystem journaling code;
* part of the ext2fs journaling system. * part of the ext2fs journaling system.
*
* Licensed under GPLv2 or later, see file License in this tarball for details.
*/ */
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -2532,16 +2527,8 @@ static void expand_inode_expression(char ch,
if (LINUX_S_ISDIR(inode->i_mode)) if (LINUX_S_ISDIR(inode->i_mode))
printf("%u", inode->i_size); printf("%u", inode->i_size);
else { else {
#ifdef EXT2_NO_64_TYPE printf("%"PRIu64, (inode->i_size |
if (inode->i_size_high) ((uint64_t) inode->i_size_high << 32)));
printf("0x%x%08x", inode->i_size_high,
inode->i_size);
else
printf("%u", inode->i_size);
#else
printf("%llu", (inode->i_size |
((__u64) inode->i_size_high << 32)));
#endif
} }
break; break;
case 'S': case 'S':
@ -2649,11 +2636,7 @@ static void expand_percent_expression(ext2_filsys fs, char ch,
printf("%u", ctx->blk); printf("%u", ctx->blk);
break; break;
case 'B': case 'B':
#ifdef EXT2_NO_64_TYPE printf("%"PRIi64, ctx->blkcount);
printf("%d", ctx->blkcount);
#else
printf("%lld", ctx->blkcount);
#endif
break; break;
case 'c': case 'c':
printf("%u", ctx->blk2); printf("%u", ctx->blk2);
@ -2674,11 +2657,7 @@ static void expand_percent_expression(ext2_filsys fs, char ch,
printf("%s", error_message(ctx->errcode)); printf("%s", error_message(ctx->errcode));
break; break;
case 'N': case 'N':
#ifdef EXT2_NO_64_TYPE printf("%"PRIi64, ctx->num);
printf("%u", ctx->num);
#else
printf("%llu", ctx->num);
#endif
break; break;
case 'p': case 'p':
print_pathname(fs, ctx->ino, 0); print_pathname(fs, ctx->ino, 0);
@ -2700,11 +2679,7 @@ static void expand_percent_expression(ext2_filsys fs, char ch,
printf("%s", ctx->str ? ctx->str : "NULL"); printf("%s", ctx->str ? ctx->str : "NULL");
break; break;
case 'X': case 'X':
#ifdef EXT2_NO_64_TYPE printf("0x%"PRIi64, ctx->num);
printf("0x%x", ctx->num);
#else
printf("0x%llx", ctx->num);
#endif
break; break;
default: default:
no_context: no_context:
@ -4436,7 +4411,7 @@ static int process_bad_block(ext2_filsys fs FSCK_ATTR((unused)),
* inode, which is never compressed. So we don't use HOLE_BLKADDR(). * inode, which is never compressed. So we don't use HOLE_BLKADDR().
*/ */
printf("Unrecoverable Error: Found %lli bad blocks starting at block number: %u\n", blockcnt, *block_nr); printf("Unrecoverable Error: Found %"PRIi64" bad blocks starting at block number: %u\n", blockcnt, *block_nr);
return BLOCK_ERROR; return BLOCK_ERROR;
} }

4
networking/ping6.c
View File

@ -311,7 +311,7 @@ static void unpack(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit
return; return;
printf("%d bytes from %s: icmp6_seq=%u", sz, printf("%d bytes from %s: icmp6_seq=%u", sz,
inet_ntop(AF_INET6, (struct in_addr6 *) &pingaddr.sin6_addr, inet_ntop(AF_INET6, &pingaddr.sin6_addr,
buf, sizeof(buf)), buf, sizeof(buf)),
icmppkt->icmp6_seq); icmppkt->icmp6_seq);
printf(" ttl=%d time=%lu.%lu ms", hoplimit, printf(" ttl=%d time=%lu.%lu ms", hoplimit,
@ -392,7 +392,7 @@ static void ping(const char *host)
printf("PING %s (%s): %d data bytes\n", printf("PING %s (%s): %d data bytes\n",
hostent->h_name, hostent->h_name,
inet_ntop(AF_INET6, (struct in_addr6 *) &pingaddr.sin6_addr, inet_ntop(AF_INET6, &pingaddr.sin6_addr,
buf, sizeof(buf)), buf, sizeof(buf)),
datalen); datalen);

12
shell/lash.c
View File

@ -243,7 +243,7 @@ static int builtin_exec(struct child_prog *child)
if (child->argv[1] == NULL) if (child->argv[1] == NULL)
return EXIT_SUCCESS; /* Really? */ return EXIT_SUCCESS; /* Really? */
child->argv++; child->argv++;
while(close_me_list) close((int)llist_pop(&close_me_list)); while(close_me_list) close((long)llist_pop(&close_me_list));
pseudo_exec(child); pseudo_exec(child);
/* never returns */ /* never returns */
} }
@ -433,7 +433,6 @@ static int builtin_source(struct child_prog *child)
{ {
FILE *input; FILE *input;
int status; int status;
int fd;
if (child->argv[1] == NULL) if (child->argv[1] == NULL)
return EXIT_FAILURE; return EXIT_FAILURE;
@ -444,8 +443,7 @@ static int builtin_source(struct child_prog *child)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
fd=fileno(input); llist_add_to(&close_me_list, (void *)(long)fileno(input));
llist_add_to(&close_me_list, (void *)fd);
/* Now run the file */ /* Now run the file */
status = busy_loop(input); status = busy_loop(input);
fclose(input); fclose(input);
@ -1339,7 +1337,7 @@ static int run_command(struct job *newjob, int inbg, int outpipe[2])
signal(SIGCHLD, SIG_DFL); signal(SIGCHLD, SIG_DFL);
// Close all open filehandles. // Close all open filehandles.
while(close_me_list) close((int)llist_pop(&close_me_list)); while(close_me_list) close((long)llist_pop(&close_me_list));
if (outpipe[1]!=-1) { if (outpipe[1]!=-1) {
close(outpipe[0]); close(outpipe[0]);
@ -1570,7 +1568,7 @@ int lash_main(int argc_l, char **argv_l)
FILE *prof_input; FILE *prof_input;
prof_input = fopen("/etc/profile", "r"); prof_input = fopen("/etc/profile", "r");
if (prof_input) { if (prof_input) {
llist_add_to(&close_me_list, (void *)fileno(prof_input)); llist_add_to(&close_me_list, (void *)(long)fileno(prof_input));
/* Now run the file */ /* Now run the file */
busy_loop(prof_input); busy_loop(prof_input);
fclose(prof_input); fclose(prof_input);
@ -1618,7 +1616,7 @@ int lash_main(int argc_l, char **argv_l)
//printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]); //printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
input = bb_xfopen(argv[optind], "r"); input = bb_xfopen(argv[optind], "r");
/* be lazy, never mark this closed */ /* be lazy, never mark this closed */
llist_add_to(&close_me_list, (void *)fileno(input)); llist_add_to(&close_me_list, (void *)(long)fileno(input));
} }
/* initialize the cwd -- this is never freed...*/ /* initialize the cwd -- this is never freed...*/

12
util-linux/nfsmount.c
View File

@ -3,15 +3,7 @@
* nfsmount.c -- Linux NFS mount * nfsmount.c -- Linux NFS mount
* Copyright (C) 1993 Rick Sladkey <jrs@world.std.com> * Copyright (C) 1993 Rick Sladkey <jrs@world.std.com>
* *
* This program is free software; you can redistribute it and/or modify * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
* Wed Feb 8 12:51:48 1995, biro@yggdrasil.com (Ross Biro): allow all port * Wed Feb 8 12:51:48 1995, biro@yggdrasil.com (Ross Biro): allow all port
* numbers to be specified on the command line. * numbers to be specified on the command line.
@ -965,7 +957,7 @@ xdr_mountres3_ok (XDR *xdrs, mountres3_ok *objp)
{ {
if (!xdr_fhandle3 (xdrs, &objp->fhandle)) if (!xdr_fhandle3 (xdrs, &objp->fhandle))
return FALSE; return FALSE;
if (!xdr_array (xdrs, (char **)&objp->auth_flavours.auth_flavours_val, (unsigned int *) &objp->auth_flavours.auth_flavours_len, ~0, if (!xdr_array (xdrs, &(objp->auth_flavours.auth_flavours_val), &(objp->auth_flavours.auth_flavours_len), ~0,
sizeof (int), (xdrproc_t) xdr_int)) sizeof (int), (xdrproc_t) xdr_int))
return FALSE; return FALSE;
return TRUE; return TRUE;

2
util-linux/nfsmount.h
View File

@ -91,7 +91,7 @@ struct mountres3_ok {
fhandle3 fhandle; fhandle3 fhandle;
struct { struct {
unsigned int auth_flavours_len; unsigned int auth_flavours_len;
int *auth_flavours_val; char *auth_flavours_val;
} auth_flavours; } auth_flavours;
}; };
typedef struct mountres3_ok mountres3_ok; typedef struct mountres3_ok mountres3_ok;