Guest User

Untitled

a guest
Feb 20th, 2018
62
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.61 KB | None | 0 0
  1. diff --git a/btrfs_cmds.c b/btrfs_cmds.c
  2. index 699dfc2..ac01e02 100644
  3. --- a/btrfs_cmds.c
  4. +++ b/btrfs_cmds.c
  5. @@ -304,7 +304,8 @@ int do_subvol_list(int argc, char **argv)
  6. int ret;
  7. int print_parent = 0;
  8. char *subvol;
  9. - int optind = 1;
  10. +
  11. + optind = 1;
  12.  
  13. while(1) {
  14. int c = getopt(argc, argv, "p");
  15. @@ -312,7 +313,6 @@ int do_subvol_list(int argc, char **argv)
  16. switch(c) {
  17. case 'p':
  18. print_parent = 1;
  19. - optind++;
  20. break;
  21. }
  22. }
  23. @@ -348,11 +348,13 @@ int do_subvol_list(int argc, char **argv)
  24. int do_clone(int argc, char **argv)
  25. {
  26. char *subvol, *dst;
  27. - int res, fd, fddst, len, e, optind = 0, readonly = 0;
  28. + int res, fd, fddst, len, e, readonly = 0;
  29. char *newname;
  30. char *dstdir;
  31. struct btrfs_ioctl_vol_args_v2 args;
  32.  
  33. + optind = 1;
  34. +
  35. memset(&args, 0, sizeof(args));
  36.  
  37. while (1) {
  38. @@ -362,7 +364,6 @@ int do_clone(int argc, char **argv)
  39. break;
  40. switch (c) {
  41. case 'r':
  42. - optind++;
  43. readonly = 1;
  44. break;
  45. default:
  46. @@ -378,8 +379,8 @@ int do_clone(int argc, char **argv)
  47. return 1;
  48. }
  49.  
  50. - subvol = argv[optind+1];
  51. - dst = argv[optind+2];
  52. + subvol = argv[optind];
  53. + dst = argv[optind+1];
  54.  
  55. res = test_issubvolume(subvol);
  56. if(res<0){
Add Comment
Please, Sign In to add comment