Skip to content

Android build fix & CMake fix - #2609

Closed
bwalle wants to merge 1 commit into
curl:masterfrom
bwalle:android-getpwuid_r
Closed

bwalle wants to merge 1 commit into
curl:masterfrom
bwalle:android-getpwuid_r

Conversation

@bwalle

@bwalle bwalle commented May 27, 2018

Copy link
Copy Markdown
Contributor

See the individual patches.

@bagder bagder left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So what header does Android want included to get the getpwuid_r declaration? This added test seems weird to me as we already check for those headers.

@snikulov

Copy link
Copy Markdown
Contributor

@bwalle It would be great to see "how to reproduce" description for the issue.
Thank you in advance.

@bwalle

bwalle commented May 28, 2018

Copy link
Copy Markdown
Contributor Author

To reproduce:

CC=/home/builduser/toolchains/android/tc/ndk14b-api19-x86/bin/i686-linux-android-gcc  ./configure --host=arm-linux

The declaration is just missing in the header, the problem is that the configure check just checks if the function is available at link-time, not if it's declared.

Contents of pwd.h:

#if 0 /* MISSING FROM BIONIC */
int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);
int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);
struct passwd* getpwent(void);
int setpwent(void);
#endif /* MISSING */

I know that the toolchain is a bit older, but we're still using that one.

@bwalle

bwalle commented May 28, 2018

Copy link
Copy Markdown
Contributor Author

But the cmake fix should be ok, isn't it?

@MarcelRaad

Copy link
Copy Markdown
Member

See also #2058. This is a bug in the NDK fixed in later versions.

@snikulov

snikulov commented May 28, 2018 •

Copy link
Copy Markdown
Contributor

@bwalle I see no CMake invocation in your "how to reproduce". Why did you add it to the subject?

@bwalle

bwalle commented May 28, 2018 •

Copy link
Copy Markdown
Contributor Author

@snikulov Well, the CMake thing has nothing todo with Android. The check for getpwuid_r is just missing. There's no build error, but the function is not used then. I'm just using cmake .. on Linux.

I discovered the issue when checking whether the declaration of getpwuid_r is checked with CMake. But CMake checks both the declaration and definition, at least according to the documentation.

@bagder

bagder commented May 28, 2018

Copy link
Copy Markdown
Member

@snikulov it seems to be an omission in the cmake build

@bwalle I think @MarcelRaad is spot on; this is an NDK issue that is already fixed. And if we were to add a work-around for this in our code, I don't see how this is a good such one!

@bwalle

bwalle commented May 28, 2018

Copy link
Copy Markdown
Contributor Author

@bagder I can remove the Android patch and keep it in my local build system until we update the toolchain. Would you merge the cmake part?

@bagder

bagder commented May 28, 2018

Copy link
Copy Markdown
Member

I can remove the Android patch and keep it in my local build system until we update the toolchain

You can of course do what you want, but I still consider it a lame "fix". It just disables the use of the function so instead you'll use a function that isn't thread-safe. A more proper fix would be to instead provide a private prototype to avoid the warning when the correct function is used!

The cmake fix is valid and I'll merge!

bagder pushed a commit that referenced this pull request May 28, 2018
The autotools-based build system does it, so we do it also in CMake.

Bug: #2609
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
@bagder

bagder commented May 29, 2018

Copy link
Copy Markdown
Member

The cmake commit is merged, the configure commit is not and needs another approach or an NDK update.

If you rather stick with that patch locally, we might just as well close this PR. What do you think @bwalle ?

@bwalle

bwalle commented May 29, 2018

Copy link
Copy Markdown
Contributor Author

I can create a new patch for the NDK issue if you advise me how you want to get it fixed, but I'm also fine with closing that PR.

@bagder

bagder commented May 29, 2018

Copy link
Copy Markdown
Member

I believe a proper fix for this broken NDK would be as following (assuming I've understood this correctly):

1 - detect the lack of getpwuid_r declaration, similar to how you did it already. If there's no proto for it, set a custom define (HAVE_NO_GETPWUID_R_PROTO perhaps?)
2 - in lib/netrc.c and lib/curl_ntlm.c, add code in the top of the files similar to:

#ifdef HAVE_NO_GETPWUID_R_PROTO
int getpwuid_r(uid_t uid, struct passwd *pwd, char *buf,
               size_t buflen, struct passwd **result);
#endif

@bwalle

bwalle commented May 29, 2018

Copy link
Copy Markdown
Contributor Author

I've updated the branch.

@bagder bagder left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I'll just let the CI tests complete first before merging to make sure there's nothing subtle there we missed...

@bagder

bagder commented May 30, 2018

Copy link
Copy Markdown
Member

And yes, it figured out this:

lib/curl_setup.h:804:34: error: "HAVE_DECL_GETPWUID_R" is not defined [-Werror=undef]
 #if defined(HAVE_GETPWUID_R) && !HAVE_DECL_GETPWUID_R
                                  ^

It highlights this problem: only the configure script will define HAVE_DECL_GETPWUID_R for the time being, so all other builds (primarily the cmake one) will use this custom prototype. I'm not 100% sure that is a real problem but I suspect it might become one.

I would prefer if the configure script defines name for the reverse: when the prototype is found to be missing as then we could be sure that only systems for which configure has detected a missing prototype would use this custom one.

On our x86 Android toolchain, getpwuid_r is implemented but the header
is missing:

 netrc.c:81:7: error: implicit declaration of function 'getpwuid_r' [-Werror=implicit-function-declaration]
        if(!getpwuid_r(geteuid(), &pw, pwbuf, sizeof(pwbuf), &pw_res)
        ^

Unfortunately, the function is used in curl_ntlm_wb.c, too, so I moved
the prototype to curl_setup.h.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
@bwalle

bwalle commented May 30, 2018

Copy link
Copy Markdown
Contributor Author

I've updated my patch.

@bagder

bagder commented May 31, 2018

Copy link
Copy Markdown
Member

Thanks!

@bagder bagder closed this in 9c33813 May 31, 2018
@lock lock Bot locked as resolved and limited conversation to collaborators Aug 29, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Development

Successfully merging this pull request may close these issues.

4 participants