Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove $Id tags #1853

Merged
merged 1 commit into from May 22, 2013
Merged

Remove $Id tags #1853

merged 1 commit into from May 22, 2013

Conversation

jlee-r7
Copy link
Contributor

@jlee-r7 jlee-r7 commented May 20, 2013

Also adds binary coding magic comment to a few files

Also adds binary coding magic comment to a few files
@@ -211,10 +211,13 @@ def actual_arch
arch = nil

if explicit_arch.nil? == false
$stderr.puts "explicit"
Copy link
Contributor

Choose a reason for hiding this comment

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

These $stderr.puts are intended in this pull request? I don't see lot of use of $stderr across msf/core code so just asking.

Copy link
Contributor

Choose a reason for hiding this comment

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

certainly not. also the if statement here should be an unless anyway.
On May 20, 2013 6:55 PM, "Juan Vazquez" notifications@github.com wrote:

In lib/msf/core/payload/generic.rb:

@@ -211,10 +211,13 @@ def actual_arch
arch = nil

    if explicit_arch.nil? == false
  •       $stderr.puts "explicit"
    

These $stderr.puts are intended in this pull request? I don't see lot of
use of $stderr across msf/core code so just asking.


Reply to this email directly or view it on GitHubhttps://github.com//pull/1853/files#r4308363
.

@limhoff-r7
Copy link
Contributor

Is the binary encoding related to Windows compatibility? Does Windows not support the utf-8 encoding? Or is the binary encoding our work-around so that pack and unpack only have to deal with single byte characters?

@wchen-r7
Copy link
Contributor

I can just restore changes for tcp.rb and generic.rb, no prob.

@jlee-r7
Copy link
Contributor Author

jlee-r7 commented May 22, 2013

Yeah, definitely an oversight. I was testing @jvennix-r7 's payload stuff and apparently left some garbage in there. =(

Thanks for catching.

wchen-r7 added a commit that referenced this pull request May 22, 2013
@wchen-r7 wchen-r7 merged commit f4498c3 into rapid7:master May 22, 2013
@jlee-r7 jlee-r7 deleted the cleanup/remove-id-tags branch May 23, 2013 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants