summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archival/bunzip2.c2
-rw-r--r--archival/gunzip.c2
-rw-r--r--editors/sed.c2
-rw-r--r--editors/vi.c16
-rw-r--r--modutils/insmod.c6
-rw-r--r--shell/ash.c6
-rw-r--r--shell/lash.c2
-rw-r--r--sysklogd/syslogd.c4
-rw-r--r--util-linux/mount.c4
9 files changed, 22 insertions, 22 deletions
diff --git a/archival/bunzip2.c b/archival/bunzip2.c
index 757654dab..da9808e82 100644
--- a/archival/bunzip2.c
+++ b/archival/bunzip2.c
@@ -2324,7 +2324,7 @@ int bunzip2_main(int argc, char **argv)
show_usage();
}
src_stream = xfopen(argv[1], "r");
- save_name = strdup(argv[1]);
+ save_name = xstrdup(argv[1]);
save_name_ptr = strrchr(save_name, '.');
if (save_name_ptr == NULL) {
return(FALSE);
diff --git a/archival/gunzip.c b/archival/gunzip.c
index 430bc630e..388672541 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -114,7 +114,7 @@ extern int gunzip_main(int argc, char **argv)
if (argv[optind] == NULL || strcmp(argv[optind], "-") == 0) {
flags |= gunzip_to_stdout;
} else {
- if_name = strdup(argv[optind]);
+ if_name = xstrdup(argv[optind]);
/* Open input file */
in_file = xfopen(if_name, "r");
diff --git a/editors/sed.c b/editors/sed.c
index 3afa64e8f..66dfa1505 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -173,7 +173,7 @@ static int index_of_next_unescaped_regexp_delim(const struct sed_cmd * const sed
*/
static int get_address(struct sed_cmd *sed_cmd, const char *str, int *linenum, regex_t **regex)
{
- char *my_str = strdup(str);
+ char *my_str = xstrdup(str);
int idx = 0;
char olddelimiter;
olddelimiter = sed_cmd->delimiter;
diff --git a/editors/vi.c b/editors/vi.c
index ddc2edc75..b65c9cf42 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -19,7 +19,7 @@
*/
static const char vi_Version[] =
- "$Id: vi.c,v 1.16 2001/10/24 04:59:23 andersen Exp $";
+ "$Id: vi.c,v 1.17 2001/11/12 16:57:26 kraai Exp $";
/*
* To compile for standalone use:
@@ -385,7 +385,7 @@ extern int vi_main(int argc, char **argv)
editing = 1; // 0=exit, 1=one file, 2+ =many files
if (cfn != 0)
free(cfn);
- cfn = (Byte *) strdup(argv[optind]);
+ cfn = (Byte *) xstrdup(argv[optind]);
edit_file(cfn);
}
}
@@ -1085,7 +1085,7 @@ static void do_cmd(Byte c)
// Stuff the last_modifying_cmd back into stdin
// and let it be re-executed.
if (last_modifying_cmd != 0) {
- ioq = ioq_start = (Byte *) strdup((char *) last_modifying_cmd);
+ ioq = ioq_start = (Byte *) xstrdup((char *) last_modifying_cmd);
}
break;
#endif /* CONFIG_FEATURE_VI_DOT_CMD */
@@ -1102,7 +1102,7 @@ static void do_cmd(Byte c)
if (last_search_pattern != 0) {
free(last_search_pattern);
}
- last_search_pattern = (Byte *) strdup((char *) q);
+ last_search_pattern = (Byte *) xstrdup((char *) q);
goto dc3; // now find the pattern
}
// user changed mind and erased the "/"- do nothing
@@ -1655,7 +1655,7 @@ static Byte *get_one_address(Byte * p, int *addr) // get colon addr, if present
*q++ = *p;
*q = '\0';
}
- pat = (Byte *) strdup((char *) buf); // save copy of pattern
+ pat = (Byte *) xstrdup((char *) buf); // save copy of pattern
if (*p == '/')
p++;
q = char_search(dot, pat, FORWARD, FULL);
@@ -1852,7 +1852,7 @@ static void colon(Byte * buf)
// There is a read-able regular file
// make this the current file
- q = (Byte *) strdup((char *) fn); // save the cfn
+ q = (Byte *) xstrdup((char *) fn); // save the cfn
if (cfn != 0)
free(cfn); // free the old name
cfn = q; // remember new cfn
@@ -1905,7 +1905,7 @@ static void colon(Byte * buf)
// user wants a new filename
if (cfn != NULL)
free(cfn);
- cfn = (Byte *) strdup((char *) args);
+ cfn = (Byte *) xstrdup((char *) args);
} else {
// user wants file status info
edit_status();
@@ -3465,7 +3465,7 @@ static Byte *get_input_line(Byte * prompt) // get input line- use "status line"
refresh(FALSE);
if (obufp != NULL)
free(obufp);
- obufp = (Byte *) strdup((char *) buf);
+ obufp = (Byte *) xstrdup((char *) buf);
return (obufp);
}
diff --git a/modutils/insmod.c b/modutils/insmod.c
index c21f22b74..8668aaa0f 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -133,7 +133,7 @@
#ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1;
-#ident "$Id: insmod.c,v 1.74 2001/10/24 04:59:54 andersen Exp $"
+#ident "$Id: insmod.c,v 1.75 2001/11/12 16:57:26 kraai Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels.
We do not use the kernel headers directly because we do not wish
@@ -350,7 +350,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1;
-#ident "$Id: insmod.c,v 1.74 2001/10/24 04:59:54 andersen Exp $"
+#ident "$Id: insmod.c,v 1.75 2001/11/12 16:57:26 kraai Exp $"
/* The relocatable object is manipulated using elfin types. */
@@ -724,7 +724,7 @@ static int check_module_name_match(const char *filename, struct stat *statbuf,
if (fullname[0] == '\0')
return (FALSE);
else {
- char *tmp, *tmp1 = strdup(filename);
+ char *tmp, *tmp1 = xstrdup(filename);
tmp = get_last_path_component(tmp1);
if (strcmp(tmp, fullname) == 0) {
free(tmp1);
diff --git a/shell/ash.c b/shell/ash.c
index f218a88d5..c1603d790 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -12090,7 +12090,7 @@ initvar() {
vpp = hashvar(ip->text);
vp->next = *vpp;
*vpp = vp;
- vp->text = strdup(ip->text);
+ vp->text = xstrdup(ip->text);
vp->flags = ip->flags;
vp->func = ip->func;
}
@@ -12102,7 +12102,7 @@ initvar() {
vpp = hashvar("PS1=");
vps1.next = *vpp;
*vpp = &vps1;
- vps1.text = strdup(geteuid() ? "PS1=$ " : "PS1=# ");
+ vps1.text = xstrdup(geteuid() ? "PS1=$ " : "PS1=# ");
vps1.flags = VSTRFIXED|VTEXTFIXED;
}
}
@@ -12646,7 +12646,7 @@ findvar(struct var **vpp, const char *name)
/*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This file contains code for the times builtin.
- * $Id: ash.c,v 1.35 2001/11/12 16:44:55 kraai Exp $
+ * $Id: ash.c,v 1.36 2001/11/12 16:57:26 kraai Exp $
*/
static int timescmd (int argc, char **argv)
{
diff --git a/shell/lash.c b/shell/lash.c
index 5b9d0a6b3..79fd433e3 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -820,7 +820,7 @@ static int expand_arguments(char *command)
/* We need a clean copy, so strsep can mess up the copy while
* we write stuff into the original (in a minute) */
- cmd = cmd_copy = strdup(command);
+ cmd = cmd_copy = xstrdup(command);
*command = '\0';
for (ix = 0, tmpcmd = cmd;
(tmpcmd = strsep_space(cmd, &ix)) != NULL; cmd += ix, ix=0) {
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 84414439e..625f99715 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -589,11 +589,11 @@ extern int syslogd_main(int argc, char **argv)
doFork = FALSE;
break;
case 'O':
- logFilePath = strdup(optarg);
+ logFilePath = xstrdup(optarg);
break;
#ifdef CONFIG_FEATURE_REMOTE_LOG
case 'R':
- RemoteHost = strdup(optarg);
+ RemoteHost = xstrdup(optarg);
if ( (p = strchr(RemoteHost, ':'))){
RemotePort = atoi(p+1);
*p = '\0';
diff --git a/util-linux/mount.c b/util-linux/mount.c
index bfa9a3040..e26d4db7a 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -463,9 +463,9 @@ extern int mount_main(int argc, char **argv)
strcpy(device, m->mnt_fsname);
strcpy(directory, m->mnt_dir);
- filesystemType = strdup(m->mnt_type);
+ filesystemType = xstrdup(m->mnt_type);
singlemount:
- string_flags = strdup(string_flags);
+ string_flags = xstrdup(string_flags);
rc = EXIT_SUCCESS;
#ifdef CONFIG_NFSMOUNT
if (strchr(device, ':') != NULL)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 02:18:19 +0000