| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: common.c,v 1.8 2008/04/19 14:49:23 joerg Exp $ */ | | 1 | /* $NetBSD: common.c,v 1.9 2008/04/21 21:15:53 joerg Exp $ */ |
2 | /*- | | 2 | /*- |
3 | * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav | | 3 | * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav |
4 | * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org> | | 4 | * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org> |
5 | * All rights reserved. | | 5 | * All rights reserved. |
6 | * | | 6 | * |
7 | * Redistribution and use in source and binary forms, with or without | | 7 | * Redistribution and use in source and binary forms, with or without |
8 | * modification, are permitted provided that the following conditions | | 8 | * modification, are permitted provided that the following conditions |
9 | * are met: | | 9 | * are met: |
10 | * 1. Redistributions of source code must retain the above copyright | | 10 | * 1. Redistributions of source code must retain the above copyright |
11 | * notice, this list of conditions and the following disclaimer | | 11 | * notice, this list of conditions and the following disclaimer |
12 | * in this position and unchanged. | | 12 | * in this position and unchanged. |
13 | * 2. Redistributions in binary form must reproduce the above copyright | | 13 | * 2. Redistributions in binary form must reproduce the above copyright |
14 | * notice, this list of conditions and the following disclaimer in the | | 14 | * notice, this list of conditions and the following disclaimer in the |
| @@ -651,27 +651,27 @@ fetch_add_entry(struct url_list *ue, str | | | @@ -651,27 +651,27 @@ fetch_add_entry(struct url_list *ue, str |
651 | ue->alloc_size = ue->alloc_size * 2 + 1; | | 651 | ue->alloc_size = ue->alloc_size * 2 + 1; |
652 | ue->urls = tmp; | | 652 | ue->urls = tmp; |
653 | } | | 653 | } |
654 | | | 654 | |
655 | tmp = ue->urls + ue->length; | | 655 | tmp = ue->urls + ue->length; |
656 | strcpy(tmp->scheme, base->scheme); | | 656 | strcpy(tmp->scheme, base->scheme); |
657 | strcpy(tmp->user, base->user); | | 657 | strcpy(tmp->user, base->user); |
658 | strcpy(tmp->pwd, base->pwd); | | 658 | strcpy(tmp->pwd, base->pwd); |
659 | strcpy(tmp->host, base->host); | | 659 | strcpy(tmp->host, base->host); |
660 | tmp->port = base->port; | | 660 | tmp->port = base->port; |
661 | memcpy(tmp_name, base->doc, base_doc_len); | | 661 | memcpy(tmp_name, base->doc, base_doc_len); |
662 | tmp_name[base_doc_len] = '/'; | | 662 | tmp_name[base_doc_len] = '/'; |
663 | memcpy(tmp_name + base_doc_len + 1, name, name_len); | | 663 | memcpy(tmp_name + base_doc_len + 1, name, name_len); |
664 | tmp_name[base_doc_len + name_len + 1] = '/'; | | 664 | tmp_name[base_doc_len + name_len + 1] = '\0'; |
665 | tmp->doc = tmp_name; | | 665 | tmp->doc = tmp_name; |
666 | tmp->offset = 0; | | 666 | tmp->offset = 0; |
667 | tmp->length = 0; | | 667 | tmp->length = 0; |
668 | | | 668 | |
669 | ++ue->length; | | 669 | ++ue->length; |
670 | | | 670 | |
671 | return (0); | | 671 | return (0); |
672 | } | | 672 | } |
673 | | | 673 | |
674 | void | | 674 | void |
675 | fetch_init_url_list(struct url_list *ue) | | 675 | fetch_init_url_list(struct url_list *ue) |
676 | { | | 676 | { |
677 | ue->length = ue->alloc_size = 0; | | 677 | ue->length = ue->alloc_size = 0; |