diff options
author | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-01-31 19:00:21 +0000 |
---|---|---|
committer | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-01-31 19:00:21 +0000 |
commit | daa692b64776f1e2552a198ae786d2e5f3b50620 (patch) | |
tree | 3933adefa4171173db78fa2389146ac89f4edb86 /nfsmount.c | |
parent | 434f1b16e15a308f02d9fc1adc5fa1e483955fed (diff) | |
download | busybox-w32-daa692b64776f1e2552a198ae786d2e5f3b50620.tar.gz busybox-w32-daa692b64776f1e2552a198ae786d2e5f3b50620.tar.bz2 busybox-w32-daa692b64776f1e2552a198ae786d2e5f3b50620.zip |
Removed trailing \n from error_msg{,_and_die} messages.
git-svn-id: svn://busybox.net/trunk/busybox@1732 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'nfsmount.c')
-rw-r--r-- | nfsmount.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nfsmount.c b/nfsmount.c index b260a885f..397858b71 100644 --- a/nfsmount.c +++ b/nfsmount.c | |||
@@ -307,7 +307,7 @@ int nfsmount(const char *spec, const char *node, int *flags, | |||
307 | msock = fsock = -1; | 307 | msock = fsock = -1; |
308 | mclient = NULL; | 308 | mclient = NULL; |
309 | if (strlen(spec) >= sizeof(hostdir)) { | 309 | if (strlen(spec) >= sizeof(hostdir)) { |
310 | error_msg("excessively long host:dir argument\n"); | 310 | error_msg("excessively long host:dir argument"); |
311 | goto fail; | 311 | goto fail; |
312 | } | 312 | } |
313 | strcpy(hostdir, spec); | 313 | strcpy(hostdir, spec); |
@@ -319,10 +319,10 @@ int nfsmount(const char *spec, const char *node, int *flags, | |||
319 | until they can be fully supported. (mack@sgi.com) */ | 319 | until they can be fully supported. (mack@sgi.com) */ |
320 | if ((s = strchr(hostdir, ','))) { | 320 | if ((s = strchr(hostdir, ','))) { |
321 | *s = '\0'; | 321 | *s = '\0'; |
322 | error_msg("warning: multiple hostnames not supported\n"); | 322 | error_msg("warning: multiple hostnames not supported"); |
323 | } | 323 | } |
324 | } else { | 324 | } else { |
325 | error_msg("directory to mount not in host:dir format\n"); | 325 | error_msg("directory to mount not in host:dir format"); |
326 | goto fail; | 326 | goto fail; |
327 | } | 327 | } |
328 | 328 | ||
@@ -332,11 +332,11 @@ int nfsmount(const char *spec, const char *node, int *flags, | |||
332 | #endif | 332 | #endif |
333 | { | 333 | { |
334 | if ((hp = gethostbyname(hostname)) == NULL) { | 334 | if ((hp = gethostbyname(hostname)) == NULL) { |
335 | error_msg("can't get address for %s\n", hostname); | 335 | error_msg("can't get address for %s", hostname); |
336 | goto fail; | 336 | goto fail; |
337 | } else { | 337 | } else { |
338 | if (hp->h_length > sizeof(struct in_addr)) { | 338 | if (hp->h_length > sizeof(struct in_addr)) { |
339 | error_msg("got bad hp->h_length\n"); | 339 | error_msg("got bad hp->h_length"); |
340 | hp->h_length = sizeof(struct in_addr); | 340 | hp->h_length = sizeof(struct in_addr); |
341 | } | 341 | } |
342 | memcpy(&server_addr.sin_addr, | 342 | memcpy(&server_addr.sin_addr, |
@@ -353,7 +353,7 @@ int nfsmount(const char *spec, const char *node, int *flags, | |||
353 | if (!old_opts) | 353 | if (!old_opts) |
354 | old_opts = ""; | 354 | old_opts = ""; |
355 | if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) { | 355 | if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) { |
356 | error_msg("excessively long option argument\n"); | 356 | error_msg("excessively long option argument"); |
357 | goto fail; | 357 | goto fail; |
358 | } | 358 | } |
359 | sprintf(new_opts, "%s%saddr=%s", | 359 | sprintf(new_opts, "%s%saddr=%s", |
@@ -513,11 +513,11 @@ int nfsmount(const char *spec, const char *node, int *flags, | |||
513 | data.flags |= (nolock ? NFS_MOUNT_NONLM : 0); | 513 | data.flags |= (nolock ? NFS_MOUNT_NONLM : 0); |
514 | #endif | 514 | #endif |
515 | if (nfsvers > MAX_NFSPROT) { | 515 | if (nfsvers > MAX_NFSPROT) { |
516 | error_msg("NFSv%d not supported!\n", nfsvers); | 516 | error_msg("NFSv%d not supported!", nfsvers); |
517 | return 0; | 517 | return 0; |
518 | } | 518 | } |
519 | if (mountvers > MAX_NFSPROT) { | 519 | if (mountvers > MAX_NFSPROT) { |
520 | error_msg("NFSv%d not supported!\n", nfsvers); | 520 | error_msg("NFSv%d not supported!", nfsvers); |
521 | return 0; | 521 | return 0; |
522 | } | 522 | } |
523 | if (nfsvers && !mountvers) | 523 | if (nfsvers && !mountvers) |
@@ -577,11 +577,11 @@ int nfsmount(const char *spec, const char *node, int *flags, | |||
577 | mount_server_addr.sin_addr.s_addr = inet_addr(hostname); | 577 | mount_server_addr.sin_addr.s_addr = inet_addr(hostname); |
578 | } else { | 578 | } else { |
579 | if ((hp = gethostbyname(mounthost)) == NULL) { | 579 | if ((hp = gethostbyname(mounthost)) == NULL) { |
580 | error_msg("can't get address for %s\n", hostname); | 580 | error_msg("can't get address for %s", hostname); |
581 | goto fail; | 581 | goto fail; |
582 | } else { | 582 | } else { |
583 | if (hp->h_length > sizeof(struct in_addr)) { | 583 | if (hp->h_length > sizeof(struct in_addr)) { |
584 | error_msg("got bad hp->h_length?\n"); | 584 | error_msg("got bad hp->h_length?"); |
585 | hp->h_length = sizeof(struct in_addr); | 585 | hp->h_length = sizeof(struct in_addr); |
586 | } | 586 | } |
587 | mount_server_addr.sin_family = AF_INET; | 587 | mount_server_addr.sin_family = AF_INET; |
@@ -716,7 +716,7 @@ int nfsmount(const char *spec, const char *node, int *flags, | |||
716 | 716 | ||
717 | if (nfsvers == 2) { | 717 | if (nfsvers == 2) { |
718 | if (status.nfsv2.fhs_status != 0) { | 718 | if (status.nfsv2.fhs_status != 0) { |
719 | error_msg("%s:%s failed, reason given by server: %s\n", | 719 | error_msg("%s:%s failed, reason given by server: %s", |
720 | hostname, dirname, | 720 | hostname, dirname, |
721 | nfs_strerror(status.nfsv2.fhs_status)); | 721 | nfs_strerror(status.nfsv2.fhs_status)); |
722 | goto fail; | 722 | goto fail; |
@@ -734,7 +734,7 @@ int nfsmount(const char *spec, const char *node, int *flags, | |||
734 | #if NFS_MOUNT_VERSION >= 4 | 734 | #if NFS_MOUNT_VERSION >= 4 |
735 | fhandle3 *fhandle; | 735 | fhandle3 *fhandle; |
736 | if (status.nfsv3.fhs_status != 0) { | 736 | if (status.nfsv3.fhs_status != 0) { |
737 | error_msg("%s:%s failed, reason given by server: %s\n", | 737 | error_msg("%s:%s failed, reason given by server: %s", |
738 | hostname, dirname, | 738 | hostname, dirname, |
739 | nfs_strerror(status.nfsv3.fhs_status)); | 739 | nfs_strerror(status.nfsv3.fhs_status)); |
740 | goto fail; | 740 | goto fail; |