lkml.org 
[lkml]   [2014]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: acpitool - /proc/acpi/wakeup
From
On Thu, Oct 9, 2014 at 10:27 PM, Chuck Ebbert <cebbert.lkml@gmail.com> wrote:
> On Thu, 9 Oct 2014 22:16:11 +0200
> Frans Klaver <fransklaver@gmail.com> wrote:
>
>> On Thu, Oct 9, 2014 at 9:58 PM, Marc Burkhardt <marc@osknowledge.org> wrote:
>> >
>> >
>> >>On Thu, Oct 9, 2014 at 9:42 PM, Marc Burkhardt <marc@osknowledge.org>
>> >>wrote:
>> >>> I upgraded from 3.10 on that machine. 3.12 didn't work for me due to
>> >>a hibernation bug. The rest was left out... :/
>> >>
>> >>If you still have the 3.12 kernel around, could you test if acpitool
>> >>-e worked there?
>> >
>> > Let me ask you a question: does it make sense to test 3.12 again because you know there's something changed regarding /proc/acpi/... or because it's the kernel I broke up on upgrading?
>>
>> Never mind. It broke after 3.14. I'll bisect.
>>
>
> The below patch fixes it for me. Looks like the line sizes changed
> and some are now exactly the right length to make it loop forever
> reading /proc/acpi/wakeup:
>
>
> --- a/src/acpitool.cpp
> +++ b/src/acpitool.cpp
> @@ -417,7 +417,7 @@ int Do_Fan_Info(int verbose)
> int Show_WakeUp_Devices(int verbose)
> {
> ifstream file_in;
> - char *filename, str[40];
> + char *filename, str[80];
>
> filename = "/proc/acpi/wakeup";
>
> @@ -438,13 +438,13 @@ int Show_WakeUp_Devices(int verbose)
> }
> else
> {
> - file_in.getline(str, 40); // first line are just headers //
> + file_in.getline(str, 80); // first line are just headers //
> cout<<" "<<str<<endl;
> cout<<" ---------------------------------------"<<endl;
> int t = 1;
> while(!file_in.eof())
> {
> - file_in.getline(str, 40);
> + file_in.getline(str, 80);
> if (strlen(str)!=0) // avoid printing last empty line //
> {
> cout<<" "<<t<<". "<<str<<endl;

Oh my. Why not use the std::string version of getline?

I doubt we should count this as "breaking userspace"..


\
 
 \ /
  Last update: 2014-10-10 00:01    [W:0.183 / U:0.944 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site