Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Reintroduced the find_own_image() function, as I think this is the cleaner

Browse Source 
approach.
* Made get_next_line() static as it should have been in the first place.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30941 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-06-01 20:47:41 +00:00
parent e9c7d49aa0
commit 656341901e
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/kits/network/dns/irs/lcl_sv.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006, Haiku, Inc. All Rights Reserved.
* Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
@ -85,13 +85,32 @@
struct service_private {
FILE* file;
char line[BUFSIZ+1];
char line[BUFSIZ + 1];
struct servent servent;
char* aliases[IRS_SV_MAXALIASES];
};
char *
static status_t
find_own_image(image_info* _info)
{
int32 cookie = 0;
image_info info;
while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) {
if (((uint32)info.text <= (uint32)find_own_image
&& (uint32)info.text + (uint32)info.text_size
> (uint32)find_own_image)) {
// found us
*_info = info;
return B_OK;
}
}
return B_ENTRY_NOT_FOUND;
}
static char*
get_next_line(struct service_private* service)
{
if (service->file == NULL)
@ -139,24 +158,12 @@ sv_rewind(struct irs_sv *sv)
// opening the standard file has file has failed, use the attribute
// find our library image
addr_t addressInImage = (addr_t)&sv_rewind;
const char* path = NULL;
image_info info;
int32 cookie = 0;
while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) {
if (addressInImage >= (addr_t)info.text
&& addressInImage < (addr_t)info.text + info.text_size) {
path = info.name;
break;
}
}
if (path == NULL)
if (find_own_image(&info) != B_OK)
return;
// open the library
int libraryFD = open(path, O_RDONLY);
int libraryFD = open(info.name, O_RDONLY);
if (libraryFD < 0)
return;